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

[Bastien Montagne]

Commit: 22f5772b44338ac4b76ded1b1137b09878a7fb7e
Author: Bastien Montagne
Date:   Mon Mar 7 16:42:19 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rB22f5772b44338ac4b76ded1b1137b09878a7fb7e

Merge branch 'asset-engine' into asset-experiments

Conflicts:
	source/creator/creator.c

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



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