From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 27 Nov 2012 21:31:35 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_4_0_1~471^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85dd63ddd3d85a4e394f1bb1b2ad90d340875114;p=thirdparty%2Fsquid.git

Merged from trunk
---

85dd63ddd3d85a4e394f1bb1b2ad90d340875114