Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sun, 3 Jan 2016 19:00:28 +0000 (20:00 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sun, 3 Jan 2016 19:00:28 +0000 (20:00 +0100)

Trivial merge