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

Merged from trunk
---

32d61de33649d9fddde9b5289918ff8e2ae4f1ca