[Bf-blender-cvs] [87eb985] mesh-transfer-data: Merge branch 'master' into mesh-transfer-data

[Bastien Montagne]

Commit: 87eb985677e30adb8ddd7884ac4801f988b17304
Author: Bastien Montagne
Date:   Sat Jan 10 10:15:44 2015 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB87eb985677e30adb8ddd7884ac4801f988b17304

Merge branch 'master' into mesh-transfer-data

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/makesrna/intern/rna_modifier.c

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



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