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

Merge from trunk
---

f7ad05a50027404eb1af3a4bb11e2c3789c903ff