Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Wed, 29 Mar 2017 21:01:16 +0000 (23:01 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Wed, 29 Mar 2017 21:01:16 +0000 (23:01 +0200)
commit15336eb262fe86ded768f43bda3aa11969a894fe
tree7f3ae55d4ae474261472b1e373eef1ae89ade1b4
parente922e42fe64ae42b8f442a0be0a40212d3369a67
parent66ef0b883446795b0d489c1010c21437d6e3cff6
Merge branch 'master' into blender2.8