Merge pull request #303 from cdunn2001/appveyor-14.0
authorChristopher Dunn <cdunn2001@gmail.com>
Sat, 11 Jul 2015 15:58:59 +0000 (10:58 -0500)
committerChristopher Dunn <cdunn2001@gmail.com>
Sat, 11 Jul 2015 15:58:59 +0000 (10:58 -0500)
commitd259f608fd2a52f94f9e5fa470cc8dc98dde8bb9
tree38d3240abb89457d2b0d52372f9a3031bec217b0
parentce32274ba53858e5e53618467b9c9582b41f5567
parent4652f818fee737005eff731c6d1d285772b8f061
Merge pull request #303 from cdunn2001/appveyor-14.0

fix appveyor 32-bit windows build

I've backed rebased under #297 because AppVeyor has been failing since there, and because that was not properly based on master anyway.