Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Wed, 19 Apr 2017 17:57:56 +0000 (19:57 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Wed, 19 Apr 2017 17:57:56 +0000 (19:57 +0200)

Trivial merge