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

[Bastien Montagne]

Commit: 341237035fb97f1492535446b9ba4b2cb966f7a9
Author: Bastien Montagne
Date:   Fri May 6 11:09:56 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB341237035fb97f1492535446b9ba4b2cb966f7a9

Merge branch 'asset-engine' into asset-experiments

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



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