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

[Antony Riakiotakis]

Commit: f0d15a679877cc9b7560c2647324421790c8d166
Author: Antony Riakiotakis
Date:   Fri May 29 17:45:03 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBf0d15a679877cc9b7560c2647324421790c8d166

Merge branch 'master' into gooseberry

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



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