From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 23 Feb 2015 13:41:49 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~24^2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa38ceab52e190a9a790b8dc33a2346c2d9908fa;p=thirdparty%2Fsquid.git

Merged from trunk
---

fa38ceab52e190a9a790b8dc33a2346c2d9908fa