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

[Lukas Tönne]

Commit: 5682c860c13c77a7138f5cff61a5eee9e5fa77a8
Author: Lukas Tönne
Date:   Fri Aug 29 17:07:07 2014 +0200
Branches: testbuild
https://developer.blender.org/rB5682c860c13c77a7138f5cff61a5eee9e5fa77a8

Merge branch 'master' into testbuild

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



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