From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 9 Jul 2015 15:15:02 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4215b8216ed5f34c080daa6319bc6d01c6000da;p=thirdparty%2Fsquid.git

Merged from trunk
---

d4215b8216ed5f34c080daa6319bc6d01c6000da