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

Merged from trunk
---

22739520a3ba10928a10ae793ed3286f8f458d1c