From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 27 Sep 2015 23:40:35 +0000 (-0700)
Subject: Merge from trunk rev.14325
X-Git-Tag: SQUID_4_0_1~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c9fcdf42dd3d0a6a35d4a067cbf12eab99fd82b;p=thirdparty%2Fsquid.git

Merge from trunk rev.14325
---

8c9fcdf42dd3d0a6a35d4a067cbf12eab99fd82b