Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Tue, 6 Sep 2016 13:46:41 +0000 (15:46 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Tue, 6 Sep 2016 13:46:41 +0000 (15:46 +0200)

Trivial merge