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

[Lukas Tönne]

Commit: 774bf7b7bc940338daa1002f6c904c5c7093a766
Author: Lukas Tönne
Date:   Fri Aug 8 00:15:27 2014 +0200
Branches: testbuild
https://developer.blender.org/rB774bf7b7bc940338daa1002f6c904c5c7093a766

Merge branch 'master' into testbuild

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



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