From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 31 Dec 2014 07:34:12 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~384^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a47eb4777fd9ca9b6bbaa907a2fc28304e26af88;p=thirdparty%2Fsquid.git

Merged from trunk
---

a47eb4777fd9ca9b6bbaa907a2fc28304e26af88