Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 9 Sep 2016 18:42:36 +0000 (20:42 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 9 Sep 2016 18:42:36 +0000 (20:42 +0200)

Trivial merge