From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 30 Dec 2014 14:59:16 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~384^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b13a7ceb1ad15eef5951625dfe6592bc4ebc93a;p=thirdparty%2Fsquid.git

Merged from trunk
---

4b13a7ceb1ad15eef5951625dfe6592bc4ebc93a