From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Sep 2015 11:40:36 +0000 (-0700)
Subject: Merged from trunk rev.14291
X-Git-Tag: SQUID_4_0_1~21^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a53b10ac8f38e02ef02bb07d5be9203688d64fcd;p=thirdparty%2Fsquid.git

Merged from trunk rev.14291
---

a53b10ac8f38e02ef02bb07d5be9203688d64fcd