[Bf-blender-cvs] [7e9eb8b] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 7e9eb8b83b8091625ec79c2f0fb0f0e1061ba8bc
Author: Antony Riakiotakis
Date:   Fri Nov 28 11:47:16 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB7e9eb8b83b8091625ec79c2f0fb0f0e1061ba8bc

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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