From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 21 Sep 2008 13:17:45 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=913a64e8434e5c87de72907f61c577391bf338b8;p=thirdparty%2Fsquid.git

Merge from trunk
---

913a64e8434e5c87de72907f61c577391bf338b8