From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 9 Oct 2015 09:24:02 +0000 (-0700)
Subject: Merge from trunk rev.14346
X-Git-Tag: SQUID_4_0_1~6^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c56d6ead4bd1c3986112150651428512f559c9f2;p=thirdparty%2Fsquid.git

Merge from trunk rev.14346
---

c56d6ead4bd1c3986112150651428512f559c9f2