Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Wed, 28 Jun 2017 20:09:53 +0000 (22:09 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Wed, 28 Jun 2017 20:09:53 +0000 (22:09 +0200)

Trivial merge