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

Trivial merge