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

[Bastien Montagne]

Commit: 31043d87cd530cffdad123b5b0efe0995619b9cb
Author: Bastien Montagne
Date:   Thu Jan 1 11:35:21 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB31043d87cd530cffdad123b5b0efe0995619b9cb

Merge branch 'master' into asset-experiments

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

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



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