From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 4 Aug 2015 11:09:58 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f188960023551b2e9cb2a9df245b92bfeef37056;p=thirdparty%2Fsquid.git

Merged from trunk
---

f188960023551b2e9cb2a9df245b92bfeef37056