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

Trivial merge