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

[Bastien Montagne]

Commit: c2049e740e3ce467ea7c260f8b14b511daa84e78
Author: Bastien Montagne
Date:   Thu Jul 2 21:22:07 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBc2049e740e3ce467ea7c260f8b14b511daa84e78

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/blenlib/BLI_ghash.h

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



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