]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 30 Nov 2016 23:16:16 +0000 (23:16 +0000)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 30 Nov 2016 23:16:16 +0000 (23:16 +0000)

Trivial merge