[Bf-blender-cvs] [e9d7c74] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: e9d7c741ca65b81334e9ab794c9190d79dcf18fc
Author: Bastien Montagne
Date:   Wed Mar 30 21:31:21 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBe9d7c741ca65b81334e9ab794c9190d79dcf18fc

Merge branch 'master' into asset-engine

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

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



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