From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 6 Jan 2015 17:54:51 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~345^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f2340a92de7eeca275f2591666abfb67ed0a139;p=thirdparty%2Fsquid.git

Merged from trunk
---

2f2340a92de7eeca275f2591666abfb67ed0a139