From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 19 Aug 2014 09:38:19 +0000 (-0700)
Subject: Merge from trunk rev.13534
X-Git-Tag: SQUID_3_5_0_1~75^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21389b467f8c8ba52359991e6d487d75aa606a85;p=thirdparty%2Fsquid.git

Merge from trunk rev.13534
---

21389b467f8c8ba52359991e6d487d75aa606a85