From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Nov 2008 12:23:06 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1289^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a03fe897776d54970cc909f855b105d7fa4417a8;p=thirdparty%2Fsquid.git

Merge from trunk
---

a03fe897776d54970cc909f855b105d7fa4417a8