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

[Bastien Montagne]

Commit: 231237f1b557bda38b39bcbef48ca2788d583fd6
Author: Bastien Montagne
Date:   Sun Aug 2 17:17:57 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB231237f1b557bda38b39bcbef48ca2788d583fd6

Merge branch 'asset-experiments' into asset-engine

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



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