Merge pull request #2161 from bmiklautz/fix/windows_build
authorNorbert Federa <nfedera@users.noreply.github.com>
Wed, 22 Oct 2014 10:25:43 +0000 (12:25 +0200)
committerNorbert Federa <nfedera@users.noreply.github.com>
Wed, 22 Oct 2014 10:25:43 +0000 (12:25 +0200)
Fix build on windows


Trivial merge