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

[Bastien Montagne]

Commit: 5240675e5a58c3dfd692b25855d54b048b5d1060
Author: Bastien Montagne
Date:   Sat Oct 4 16:51:22 2014 +0200
Branches: mesh-transfer-data
https://developer.blender.org/rB5240675e5a58c3dfd692b25855d54b048b5d1060

Merge branch 'master' into mesh-transfer-data

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



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