Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)

Trivial merge