]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 9 Jul 2015 15:15:02 +0000 (17:15 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Thu, 9 Jul 2015 15:15:02 +0000 (17:15 +0200)
1  2 
src/neighbors.cc
src/store_rebuild.h

Simple merge
Simple merge