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

[Bastien Montagne]

Commit: 113c17ea7636df69edb8205e162bbdd4a6a868ba
Author: Bastien Montagne
Date:   Mon May 11 17:25:43 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB113c17ea7636df69edb8205e162bbdd4a6a868ba

Merge branch 'asset-experiments' into asset-engine

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



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