Merge branch 'master' of https://github.com/luho383/assimp
authorlutz.hoeren <lutz.hoeren@redplant.de>
Wed, 16 Dec 2015 14:26:10 +0000 (15:26 +0100)
committerlutz.hoeren <lutz.hoeren@redplant.de>
Wed, 16 Dec 2015 14:26:10 +0000 (15:26 +0100)

Trivial merge