From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 10 Nov 2012 10:37:56 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_4_0_1~471^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4795312f9871cc3fd18b652910746a78450ef910;p=thirdparty%2Fsquid.git

Merged from trunk
---

4795312f9871cc3fd18b652910746a78450ef910