]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 22 May 2010 06:35:57 +0000 (18:35 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 22 May 2010 06:35:57 +0000 (18:35 +1200)
1  2 
src/comm.cc
src/ftp.cc
src/http.cc

diff --cc src/comm.cc
Simple merge
diff --cc src/ftp.cc
Simple merge
diff --cc src/http.cc
Simple merge