Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)

Trivial merge