From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 7 Jan 2015 10:45:25 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~345^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b45ba55888f42995472065e18d4d179e3c84b79;p=thirdparty%2Fsquid.git

Merged from trunk
---

6b45ba55888f42995472065e18d4d179e3c84b79