]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk.
authorAlex Rousskov <rousskov@measurement-factory.com>
Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
1  2 
src/cache_cf.cc
src/http.cc

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