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

[Campbell Barton]

Commit: e7d0c58bc97d4d9c6c23e325e679d84570149c12
Author: Campbell Barton
Date:   Tue Dec 2 18:00:48 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBe7d0c58bc97d4d9c6c23e325e679d84570149c12

Merge branch 'master' into gooseberry

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



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