Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)

Trivial merge