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

[Bastien Montagne]

Commit: e4d9f9b772cdaa72c410c30567580e1f65b60353
Author: Bastien Montagne
Date:   Wed Dec 10 15:58:39 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBe4d9f9b772cdaa72c410c30567580e1f65b60353

Merge branch 'master' into asset-experiments

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



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