Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 11 Jan 2016 20:16:17 +0000 (21:16 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 11 Jan 2016 20:16:17 +0000 (21:16 +0100)

Trivial merge