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

[Lukas Tönne]

Commit: 8c069258df4f5c7b7ba1c03ec255872636af64bc
Author: Lukas Tönne
Date:   Fri Dec 12 16:32:47 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB8c069258df4f5c7b7ba1c03ec255872636af64bc

Merge branch 'master' into gooseberry

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



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