From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 1 Jun 2014 14:17:37 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_5_0_1~217^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2d9e49ca5aedf32d3d966bd458792f950e86669;p=thirdparty%2Fsquid.git

Merged from trunk
---

a2d9e49ca5aedf32d3d966bd458792f950e86669