[Bf-blender-cvs] [a461d07] testbuild: Merge branch 'master' into testbuild

[Lukas Tönne]

Commit: a461d07be981b30cb9566fc444359f88f289d35e
Author: Lukas Tönne
Date:   Thu Sep 18 11:28:24 2014 +0200
Branches: testbuild
https://developer.blender.org/rBa461d07be981b30cb9566fc444359f88f289d35e

Merge branch 'master' into testbuild

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



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