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

Merged from trunk
---

c4d568ddc472d9195689ac2586a2cd650dfb28ca