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

Merge from trunk rev.14346
---

3a94fd0b5f732faa8aba3f5a29e07b52e5ff2409