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

[Bastien Montagne]

Commit: 46e6f3b4204ed8d9d375c7e751524c67636f877c
Author: Bastien Montagne
Date:   Mon Jan 4 20:35:05 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB46e6f3b4204ed8d9d375c7e751524c67636f877c

Merge branch 'master' into asset-engine

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



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