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

[Antony Riakiotakis]

Commit: b52530f104b9d07bd9453c3ad821c078f88382d2
Author: Antony Riakiotakis
Date:   Wed Jan 28 14:44:12 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBb52530f104b9d07bd9453c3ad821c078f88382d2

Merge branch 'master' into gooseberry

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



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