From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 27 Jul 2015 16:27:11 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~24^2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd3fbb47f669355d9a261499d18bdd282b04708;p=thirdparty%2Fsquid.git

Merged from trunk
---

ddd3fbb47f669355d9a261499d18bdd282b04708