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

[Bastien Montagne]

Commit: 337d7b2a6ae788824f4b34c65f1027b1b8ac8347
Author: Bastien Montagne
Date:   Mon Dec 8 10:56:15 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB337d7b2a6ae788824f4b34c65f1027b1b8ac8347

Merge branch 'master' into asset-experiments

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



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