]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 27 May 2010 01:31:51 +0000 (13:31 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 27 May 2010 01:31:51 +0000 (13:31 +1200)
1  2 
src/http.cc
src/main.cc

diff --cc src/http.cc
Simple merge
diff --cc src/main.cc
Simple merge