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

[Lukas Tönne]

Commit: 920aa5e7d2da91805acb8e2c2963fd908f873eeb
Author: Lukas Tönne
Date:   Fri May 1 17:43:49 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB920aa5e7d2da91805acb8e2c2963fd908f873eeb

Merge branch 'master' into gooseberry

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



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