Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)

Trivial merge