[Bf-blender-cvs] [e0c275e] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: e0c275e239154b69a4856a5a583525c3932cd2e5
Author: Bastien Montagne
Date:   Sat May 2 17:03:22 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBe0c275e239154b69a4856a5a583525c3932cd2e5

Merge branch 'master' into asset-engine

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



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