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

[Bastien Montagne]

Commit: d012380caec622d13862b23989b908bee2155274
Author: Bastien Montagne
Date:   Thu Jun 16 23:45:02 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rBd012380caec622d13862b23989b908bee2155274

Merge branch 'asset-engine' into asset-experiments

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



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