[Bf-blender-cvs] [b11d37e] temp-python-bgl: Merge branch 'master' into temp-python-bgl

[Campbell Barton]

Commit: b11d37ed3591c9b3ae7c1f9e91a81ac3b6b7e96b
Author: Campbell Barton
Date:   Fri Jul 24 05:39:52 2015 +1000
Branches: temp-python-bgl
https://developer.blender.org/rBb11d37ed3591c9b3ae7c1f9e91a81ac3b6b7e96b

Merge branch 'master' into temp-python-bgl

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



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