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

[Bastien Montagne]

Commit: e49966dd96afc42c3594095c8f535299d7d3219f
Author: Bastien Montagne
Date:   Mon Jan 4 11:55:56 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBe49966dd96afc42c3594095c8f535299d7d3219f

Merge branch 'master' into asset-engine

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



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