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

[Bastien Montagne]

Commit: ab9f937bd825ab4c0ef862b05d0be58c831f7c29
Author: Bastien Montagne
Date:   Wed Apr 15 16:45:35 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBab9f937bd825ab4c0ef862b05d0be58c831f7c29

Merge branch 'asset-experiments' into asset-engine

Conflicts:
	release/scripts/startup/bl_ui/space_filebrowser.py
	source/blender/makesrna/intern/rna_space.c

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



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