From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 26 Oct 2008 00:27:31 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~1378^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3bd4619d03093be11a69d5380339e7afa86421;p=thirdparty%2Fsquid.git

Merged from trunk
---

cb3bd4619d03093be11a69d5380339e7afa86421