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

Merged from trunk
---

4d85369302ad4df4e0fa357ba9198d454e5f3018