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

[Bastien Montagne]

Commit: 056f11ec8ddeb67c3dbb5c65cb763bf41c861dea
Author: Bastien Montagne
Date:   Mon May 4 15:55:45 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB056f11ec8ddeb67c3dbb5c65cb763bf41c861dea

Merge branch 'master' into asset-engine

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



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