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

Merged from trunk
---

6d2510bd7298b012e10f1f214cd222441051b831