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

Merged from trunk
---

f85cf44a7780d636c3b4964722fc75463345d06e