[Bf-blender-cvs] [9c6abdf] asset-engine: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 9c6abdff3a6e1ef8809f91657607ae7927162573
Author: Bastien Montagne
Date:   Mon Mar 9 15:32:52 2015 +0100
Branches: asset-engine
https://developer.blender.org/rB9c6abdff3a6e1ef8809f91657607ae7927162573

Merge branch 'master' into asset-experiments

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



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