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

[Lukas Tönne]

Commit: 4dec17b48c72137ceb6302295b2995324e82587c
Author: Lukas Tönne
Date:   Fri Jan 16 17:34:19 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB4dec17b48c72137ceb6302295b2995324e82587c

Merge branch 'master' into gooseberry

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



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