From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 29 Mar 2016 16:11:58 +0000 (+1300)
Subject: Merged from trunk rev.14612
X-Git-Tag: SQUID_4_0_8~7^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81d4498afc9e7d7d58794538ac610c1b4f3438cf;p=thirdparty%2Fsquid.git

Merged from trunk rev.14612
---

81d4498afc9e7d7d58794538ac610c1b4f3438cf