[Bf-blender-cvs] [83ec2b9] mesh-transfer-data: Merge branch 'master' into mesh-transfer-data

[Bastien Montagne]

Commit: 83ec2b964ac70deb78bf0df2594c6cc9f71ec082
Author: Bastien Montagne
Date:   Sun Nov 16 14:41:53 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB83ec2b964ac70deb78bf0df2594c6cc9f71ec082

Merge branch 'master' into mesh-transfer-data

Conflicts:
	source/blender/editors/object/object_vgroup.c

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



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