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

[Bastien Montagne]

Commit: b5a65fd7befd9f50887f8657748f0793b1f1444a
Author: Bastien Montagne
Date:   Sat Jun 27 23:42:06 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBb5a65fd7befd9f50887f8657748f0793b1f1444a

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/blenlib/intern/BLI_filelist.c

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



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