]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk rev.13957
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 28 Feb 2015 00:41:08 +0000 (16:41 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 28 Feb 2015 00:41:08 +0000 (16:41 -0800)
1  2 
src/HttpRequest.cc
src/HttpRequest.h
src/adaptation/icap/Xaction.cc
src/tunnel.cc

Simple merge
Simple merge
Simple merge
diff --cc src/tunnel.cc
Simple merge