From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 18 Jan 2009 04:44:20 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0444356d1cc3a58b092f50a56c0851c85cf09ed4;p=thirdparty%2Fsquid.git

Merge from trunk
---

0444356d1cc3a58b092f50a56c0851c85cf09ed4