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

[Antony Riakiotakis]

Commit: 7c28ee9c4aea7f31ec9cac27f33614337328ffcf
Author: Antony Riakiotakis
Date:   Mon Apr 13 18:38:21 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB7c28ee9c4aea7f31ec9cac27f33614337328ffcf

Merge branch 'master' into gooseberry

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



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