]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 3 Feb 2009 23:13:10 +0000 (00:13 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 3 Feb 2009 23:13:10 +0000 (00:13 +0100)
1  2 
src/adaptation/Config.cc
src/adaptation/ServiceConfig.cc
src/ftp.cc

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