From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 29 Jul 2015 13:33:12 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b085643e86a170806aae4d24e8114e4b2ac0eba1;p=thirdparty%2Fsquid.git

Merged from trunk
---

b085643e86a170806aae4d24e8114e4b2ac0eba1