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

[Antony Riakiotakis]

Commit: 335b49519625b034c2a8e1cf407018e0a70606ad
Author: Antony Riakiotakis
Date:   Thu Apr 2 12:37:22 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB335b49519625b034c2a8e1cf407018e0a70606ad

Merge branch 'master' into gooseberry

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



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