Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Wed, 10 May 2017 16:30:36 +0000 (18:30 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Wed, 10 May 2017 16:30:36 +0000 (18:30 +0200)

Trivial merge