Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)

Trivial merge