From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 2 Jan 2015 09:07:07 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~384^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7eb91e0780507c473659d3f5daf0397398097b17;p=thirdparty%2Fsquid.git

Merged from trunk
---

7eb91e0780507c473659d3f5daf0397398097b17