]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 13 Sep 2012 06:56:05 +0000 (08:56 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 13 Sep 2012 06:56:05 +0000 (08:56 +0200)
1  2 
src/client_side_reply.cc
src/forward.cc

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