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

[Julian Eisel]

Commit: f6fd536d2c76d5dfac2b78e81c7b3d9416f128a3
Author: Julian Eisel
Date:   Fri Sep 18 22:59:07 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBf6fd536d2c76d5dfac2b78e81c7b3d9416f128a3

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/blenkernel/BKE_blender.h

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



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