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

Merged from trunk
---

b4d6a7a99ce8c8bb316b0834b75a28fe9d5b015e