]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 29 Jul 2015 13:33:12 +0000 (15:33 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 29 Jul 2015 13:33:12 +0000 (15:33 +0200)

Trivial merge