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

[Antony Riakiotakis]

Commit: 5f195acd1ee9a01872b6b5154bf120da23e0d2d5
Author: Antony Riakiotakis
Date:   Wed May 20 12:42:23 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB5f195acd1ee9a01872b6b5154bf120da23e0d2d5

Merge branch 'master' into gooseberry

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



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