Merge pull request #671 from sgraham/compile-vs2013
authorNico Weber <nicolasweber@gmx.de>
Fri, 18 Oct 2013 04:16:13 +0000 (21:16 -0700)
committerNico Weber <nicolasweber@gmx.de>
Fri, 18 Oct 2013 04:16:13 +0000 (21:16 -0700)
commit0c99f2434283ae4373e2fcf45cd9a8ec43348de3
tree293e0b77beb4f813f01636649c09cdd600fb147f
parent6f7ea464bb9161ce2e15deb97977886de152c12d
parenta90b279e469ec4ad3c57dff5075acecabc41e70a
Merge pull request #671 from sgraham/compile-vs2013

Fix compilation on VS2013