From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 28 Jul 2015 08:09:21 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=974f60e6a41cdf3cdd4301aaad7f684c8442fa1e;p=thirdparty%2Fsquid.git

Merged from trunk
---

974f60e6a41cdf3cdd4301aaad7f684c8442fa1e