[Bf-blender-cvs] [5036677] soc-2014-viewport_fx: Merge remote-tracking branch 'origin' into soc-2014-viewport_fx

[Jason Wilkins]

Commit: 50366779e60a46611e82be614f10a745d3c7cb5e
Author: Jason Wilkins
Date:   Thu Jul 10 18:18:14 2014 -0500
https://developer.blender.org/rB50366779e60a46611e82be614f10a745d3c7cb5e

Merge remote-tracking branch 'origin' into soc-2014-viewport_fx

Conflicts:
	source/blender/gpu/shaders/gpu_shader_simple_vert.glsl

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



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