From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 3 Oct 2015 08:28:48 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_4_0_1~5^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45f8e01e0a639f21e097a8d02b22c5a95a45919a;p=thirdparty%2Fsquid.git

Merge from trunk
---

45f8e01e0a639f21e097a8d02b22c5a95a45919a