[Bf-blender-cvs] [d693aa3] temp-ui-widget-refactor: Merge branch 'master' into temp-ui-widget-refactor

[Julian Eisel]

Commit: d693aa3590b7cdf72f28bb793153bfa3f307fd82
Author: Julian Eisel
Date:   Sat Aug 15 01:00:03 2015 +0200
Branches: temp-ui-widget-refactor
https://developer.blender.org/rBd693aa3590b7cdf72f28bb793153bfa3f307fd82

Merge branch 'master' into temp-ui-widget-refactor

Conflicts:
	source/blender/editors/interface/interface_widgets.c

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



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