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

[Bastien Montagne]

Commit: da81c78fc7b78d4fd7b4a1f1799d47c9a1d5cae5
Author: Bastien Montagne
Date:   Thu Jan 21 09:45:52 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBda81c78fc7b78d4fd7b4a1f1799d47c9a1d5cae5

Merge branch 'master' into asset-engine

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



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