Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)

Trivial merge