[Bf-blender-cvs] [72acb1e] soc-2014-viewport_context: Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

[Jason Wilkins]

Commit: 72acb1ea30569458ec932ef9149914a04b7c1cde
Author: Jason Wilkins
Date:   Thu Jul 31 06:10:31 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB72acb1ea30569458ec932ef9149914a04b7c1cde

Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

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



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