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

Merge from trunk
---

c28b4cf272cb059254aa7159fc2c1f3e99f783f9