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

[Lukas Tönne]

Commit: 95c5c39e5df370ac94873b0722d9c2905954a162
Author: Lukas Tönne
Date:   Sat Nov 15 14:15:30 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB95c5c39e5df370ac94873b0722d9c2905954a162

Merge branch 'master' into gooseberry

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



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