]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk.
authorAlex Rousskov <rousskov@measurement-factory.com>
Fri, 13 Mar 2009 20:45:32 +0000 (14:45 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Fri, 13 Mar 2009 20:45:32 +0000 (14:45 -0600)
1  2 
src/acl/Ip.cc
src/cache_cf.cc

diff --cc src/acl/Ip.cc
Simple merge
diff --cc src/cache_cf.cc
Simple merge