From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 2 Oct 2009 10:08:10 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe9e20bc5746bed666b7e3da8b79ef963d9e645;p=thirdparty%2Fsquid.git

Merge from trunk
---

6fe9e20bc5746bed666b7e3da8b79ef963d9e645