]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Sat, 3 Jan 2015 09:59:51 +0000 (10:59 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Sat, 3 Jan 2015 09:59:51 +0000 (10:59 +0100)

Trivial merge