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

[Bastien Montagne]

Commit: 12b77ef1ae76a82350396eee4dbf6a5971f58339
Author: Bastien Montagne
Date:   Thu Jul 31 17:42:56 2014 +0200
Branches: testbuild
https://developer.blender.org/rB12b77ef1ae76a82350396eee4dbf6a5971f58339

Merge branch 'master' into testbuild

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



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