Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sun, 6 Dec 2015 11:20:11 +0000 (12:20 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sun, 6 Dec 2015 11:20:11 +0000 (12:20 +0100)

Trivial merge