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

[Bastien Montagne]

Commit: c3866a0fe1f7e72714d88bda77b6a147802e9e94
Author: Bastien Montagne
Date:   Thu Jun 11 20:07:29 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBc3866a0fe1f7e72714d88bda77b6a147802e9e94

Merge branch 'master' into asset-experiments

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

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



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