[Bf-blender-cvs] [606de82] gooseberry: Merge branch 'wiggly-widgets' into gooseberry

[Antony Riakiotakis]

Commit: 606de8221817d138d0aa3be2a373b954d13357fe
Author: Antony Riakiotakis
Date:   Mon Feb 9 14:30:12 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB606de8221817d138d0aa3be2a373b954d13357fe

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
	source/blender/blenkernel/intern/customdata.c
	source/blender/makesdna/DNA_customdata_types.h

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



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