[Bf-blender-cvs] [eb8b241] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: eb8b2413deb0f851d2f76aab49362519ec062bef
Author: Bastien Montagne
Date:   Fri Apr 10 14:27:18 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBeb8b2413deb0f851d2f76aab49362519ec062bef

Merge branch 'master' into asset-experiments

===================================================================



===================================================================