Louis DeJardin fd9f392ec9 Fixing merge conflicts (?)		2014-01-27 12:47:14 -08:00
src	Fixing merge conflicts (?)	2014-01-27 12:47:14 -08:00
test	…
.gitignore	…
HttpAbstractions.sln	Fixing merge conflicts (?)	2014-01-27 12:47:14 -08:00
NuGet.Config	…
build.cmd	…
makefile.shade	…