Merge pull request #1545 from akoeplinger/fix-windows-build
authorZoltan Varga <vargaz@gmail.com>
Tue, 3 Feb 2015 20:58:12 +0000 (15:58 -0500)
committerZoltan Varga <vargaz@gmail.com>
Tue, 3 Feb 2015 20:58:12 +0000 (15:58 -0500)
Fix Windows build


Trivial merge