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

[Antony Riakiotakis]

Commit: b6aaa7395304e62e67099fefff831ae5cb1749b7
Author: Antony Riakiotakis
Date:   Wed Apr 29 12:38:26 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBb6aaa7395304e62e67099fefff831ae5cb1749b7

Merge branch 'master' into gooseberry

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



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