Merge pull request #1252 from alesliehughes/master
authorZoltan Varga <vargaz@gmail.com>
Wed, 3 Sep 2014 18:44:32 +0000 (14:44 -0400)
committerZoltan Varga <vargaz@gmail.com>
Wed, 3 Sep 2014 18:44:32 +0000 (14:44 -0400)
Stop warning about winsock2.h being included before windows.h


Trivial merge