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

[Bastien Montagne]

Commit: 6196713c5cefb2c149b37506e69ef6cf404aeab0
Author: Bastien Montagne
Date:   Sun Nov 23 15:41:34 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB6196713c5cefb2c149b37506e69ef6cf404aeab0

Merge branch 'master' into mesh-transfer-data

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



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