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

Merge from trunk
---

9a25d2cff3d22fee55b703ef1c3fee0628801045