]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Fri, 7 Feb 2014 15:38:35 +0000 (16:38 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Fri, 7 Feb 2014 15:38:35 +0000 (16:38 +0100)
1  2 
src/cache_cf.cc
src/client_side.cc
src/errorpage.cc

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