Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)

Trivial merge