From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 1 Oct 2015 04:01:13 +0000 (-0700)
Subject: Merged from trunk rev.14335
X-Git-Tag: SQUID_4_0_1~5^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8c21a8a70e8cc727a238c0a89de15b82ab27d88;p=thirdparty%2Fsquid.git

Merged from trunk rev.14335
---

d8c21a8a70e8cc727a238c0a89de15b82ab27d88