From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 14 Nov 2008 09:39:21 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9014e4cdf0601e480a175420ed3af83d13fd689;p=thirdparty%2Fsquid.git

Merged from trunk
---

a9014e4cdf0601e480a175420ed3af83d13fd689