[Bf-blender-cvs] [a9efb6a] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: a9efb6a5aed2322c5b063a4366eba08dee97f262
Author: Bastien Montagne
Date:   Wed May 20 09:19:23 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBa9efb6a5aed2322c5b063a4366eba08dee97f262

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/editors/space_file/filelist.c

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



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