From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 31 Jul 2015 19:26:52 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6c2c4c6215f77c8ee96ee3eeb392a9cb7607d6c;p=thirdparty%2Fsquid.git

Merged from trunk
---

c6c2c4c6215f77c8ee96ee3eeb392a9cb7607d6c