[Bf-blender-cvs] [955cb4a] asset-experiments: Merge branch 'asset-engine' into asset-experiments

[Bastien Montagne]

Commit: 955cb4a8dbea8c7795059344080f501b2c0c8c65
Author: Bastien Montagne
Date:   Thu Jan 21 09:46:46 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rB955cb4a8dbea8c7795059344080f501b2c0c8c65

Merge branch 'asset-engine' into asset-experiments

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



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