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

[Lukas Tönne]

Commit: 4dd4145fee29b09103d890121f0e6c3c2e56bb22
Author: Lukas Tönne
Date:   Thu Oct 30 15:31:47 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB4dd4145fee29b09103d890121f0e6c3c2e56bb22

Merge branch 'master' into gooseberry

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



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