]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 18 Jan 2009 04:44:20 +0000 (17:44 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 18 Jan 2009 04:44:20 +0000 (17:44 +1300)
1  2 
src/cache_cf.cc
src/cf.data.pre
src/errorpage.h
src/ftp.cc

diff --cc src/cache_cf.cc
Simple merge
diff --cc src/cf.data.pre
Simple merge
diff --cc src/errorpage.h
Simple merge
diff --cc src/ftp.cc
Simple merge