[Bf-blender-cvs] [1e3d756] asset-experiments: Merge branch 'asset-engine' into asset-experiments

[Bastien Montagne]

Commit: 1e3d75604df716beb39e9be41d9b971be7f92eae
Author: Bastien Montagne
Date:   Thu Apr 7 15:26:32 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB1e3d75604df716beb39e9be41d9b971be7f92eae

Merge branch 'asset-engine' into asset-experiments

Conflicts:
	source/blender/blenkernel/intern/blender.c

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



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