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

[Bastien Montagne]

Commit: 07042a8d5d34ab1149f64de49b0d710f820e05ee
Author: Bastien Montagne
Date:   Sun Feb 15 16:49:42 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB07042a8d5d34ab1149f64de49b0d710f820e05ee

Merge branch 'master' into asset-experiments

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

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



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