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

[Lukas Tönne]

Commit: 77a5443c60a62dc0d53513e3389e7961b9b0072e
Author: Lukas Tönne
Date:   Sat Apr 18 15:03:13 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB77a5443c60a62dc0d53513e3389e7961b9b0072e

Merge branch 'master' into gooseberry

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



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