Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)

Trivial merge