From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 30 Sep 2015 09:32:39 +0000 (-0700)
Subject: Merged from trunk rev.14331
X-Git-Tag: SQUID_4_0_1~5^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8612e4160443df413d2642db79544af09f93df7a;p=thirdparty%2Fsquid.git

Merged from trunk rev.14331
---

8612e4160443df413d2642db79544af09f93df7a