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

[Bastien Montagne]

Commit: 80c0f3da2292f88675056b8a39274e482778d50f
Author: Bastien Montagne
Date:   Tue Apr 14 16:10:00 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB80c0f3da2292f88675056b8a39274e482778d50f

Merge branch 'asset-experiments' into asset-engine

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



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