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

[Bastien Montagne]

Commit: f4214d1d1c24ded6bd18c0903c2867ae84a04591
Author: Bastien Montagne
Date:   Fri Jan 15 16:31:13 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rBf4214d1d1c24ded6bd18c0903c2867ae84a04591

Merge branch 'asset-engine' into asset-experiments

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



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