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

[Jonathan deWerd]

Commit: 8ab3c8b6fa226bba7ba5dc68ec190a5aa03c4ab7
Author: Jonathan deWerd
Date:   Sat Sep 13 17:01:53 2014 -0400
Branches: testbuild
https://developer.blender.org/rB8ab3c8b6fa226bba7ba5dc68ec190a5aa03c4ab7

Merge branch 'master' into testbuild

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



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