[Bf-blender-cvs] [255edd9] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: 255edd977f52109cb7961820759f2e7888a33d73
Author: Lukas Tönne
Date:   Wed Nov 4 11:05:49 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB255edd977f52109cb7961820759f2e7888a33d73

Merge branch 'master' into object_nodes

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



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