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

Merged from trunk
---

32d91ce270453f0a011dbedb3321cda20dbe1aa7