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

[Antony Riakiotakis]

Commit: b9bccd578855fef6b909309e28b70ef5c00e8b05
Author: Antony Riakiotakis
Date:   Wed Jun 17 17:05:27 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBb9bccd578855fef6b909309e28b70ef5c00e8b05

Merge branch 'master' into gooseberry

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



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