Merge pull request #1637 from soimort/fix-build
authorJoão Matos <joao@tritao.eu>
Wed, 18 Mar 2015 09:26:14 +0000 (09:26 +0000)
committerJoão Matos <joao@tritao.eu>
Wed, 18 Mar 2015 09:26:14 +0000 (09:26 +0000)
Fix build on Linux and Windows


Trivial merge