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

[Bastien Montagne]

Commit: a9f02fda07e86517b9e8d450e22248ca8c87eee1
Author: Bastien Montagne
Date:   Sat Mar 21 16:48:34 2015 +0100
Branches: asset-engine
https://developer.blender.org/rBa9f02fda07e86517b9e8d450e22248ca8c87eee1

Merge branch 'asset-experiments' into asset-engine

Conflicts:
	source/blender/makesdna/DNA_space_types.h

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



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