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

[Antony Riakiotakis]

Commit: f26b373cb922e79bce34eed7bdb7a8ee29a3dab4
Author: Antony Riakiotakis
Date:   Wed May 6 15:31:57 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBf26b373cb922e79bce34eed7bdb7a8ee29a3dab4

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/object/object_shapekey.c

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



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