]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 6 Jan 2015 17:54:51 +0000 (18:54 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 6 Jan 2015 17:54:51 +0000 (18:54 +0100)

Trivial merge