Merge pull request #1003 from sgraham/2015-compile
authorNico Weber <nicolasweber@gmx.de>
Mon, 10 Aug 2015 15:35:33 +0000 (08:35 -0700)
committerNico Weber <nicolasweber@gmx.de>
Mon, 10 Aug 2015 15:35:33 +0000 (08:35 -0700)
Fix compile on VS2015


Trivial merge