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

[Bastien Montagne]

Commit: e2aab5750b9d8baaf4baf38911cb93de1114b347
Author: Bastien Montagne
Date:   Sat Oct 3 19:03:38 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBe2aab5750b9d8baaf4baf38911cb93de1114b347

Merge branch 'master' into asset-engine

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



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