[Bf-blender-cvs] [b54017e] soc-2014-viewport_fx: Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

[Jason Wilkins]

Commit: b54017edb0c030805a20b1284389072c84bc4764
Author: Jason Wilkins
Date:   Fri Jun 27 06:09:00 2014 -0500
https://developer.blender.org/rBb54017edb0c030805a20b1284389072c84bc4764

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

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



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