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

[Bastien Montagne]

Commit: 158e6fd7f3d02b78cff9854809a48ca5c019a3f7
Author: Bastien Montagne
Date:   Thu Dec 4 11:19:31 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB158e6fd7f3d02b78cff9854809a48ca5c019a3f7

Merge branch 'master' into asset-experiments

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



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