]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 19 Jan 2012 21:00:56 +0000 (22:00 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 19 Jan 2012 21:00:56 +0000 (22:00 +0100)
1  2 
src/cf.data.pre
src/dns_internal.cc

diff --cc src/cf.data.pre
Simple merge
Simple merge