From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 9 Sep 2015 17:01:44 +0000 (-0700)
Subject: Merge from trunk rev.14289
X-Git-Tag: SQUID_4_0_1~21^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f7004fe74a509c2d74dbdc6bfcaeb2cf7563f71;p=thirdparty%2Fsquid.git

Merge from trunk rev.14289
---

7f7004fe74a509c2d74dbdc6bfcaeb2cf7563f71