]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Sun, 1 Jun 2014 14:17:37 +0000 (16:17 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Sun, 1 Jun 2014 14:17:37 +0000 (16:17 +0200)

Trivial merge