[Bf-blender-cvs] [9f53c6b] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 9f53c6b4eb6d8d4aadfe53732e6ec3784dc9e6d6
Author: Julian Eisel
Date:   Fri Feb 12 17:49:44 2016 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB9f53c6b4eb6d8d4aadfe53732e6ec3784dc9e6d6

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/transform/transform_manipulator.c

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



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