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

[Lukas Tönne]

Commit: 7e4e99c2947b9e429c396817f31d4ce819b8e3c7
Author: Lukas Tönne
Date:   Mon Feb 2 14:48:13 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB7e4e99c2947b9e429c396817f31d4ce819b8e3c7

Merge branch 'master' into gooseberry

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



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