From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 1 Aug 2015 15:35:37 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1595c56f74dfc6f4e5fd7c96c96fdb6ea0568c3e;p=thirdparty%2Fsquid.git

Merged from trunk
---

1595c56f74dfc6f4e5fd7c96c96fdb6ea0568c3e