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

Merged from trunk
---

0f6c22fbd904ef4841036fffc5eab2a5b4e94828