Merge pull request #887 from berenm/master
authorNico Weber <nicolasweber@gmx.de>
Sun, 4 Jan 2015 01:53:57 +0000 (17:53 -0800)
committerNico Weber <nicolasweber@gmx.de>
Sun, 4 Jan 2015 01:53:57 +0000 (17:53 -0800)
commitefdfaa0907dcf687b55f15fad299e460abbcda58
treee3085f86cb3b2cc2cdaba97ab5ad9082da4b7a1b
parent82e372d5fd09ef37ab1b2f1c1cc175df26648653
parentd1e6a29fd30337e86c346208661c00233fd223f7
Merge pull request #887 from berenm/master

Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900)