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

[Bastien Montagne]

Commit: d4e5cad70e0e399de3ca377f62e6c2979064ca2a
Author: Bastien Montagne
Date:   Tue Jun 2 10:20:13 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBd4e5cad70e0e399de3ca377f62e6c2979064ca2a

Merge branch 'asset-experiments' into asset-engine

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



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