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

Merge from trunk
---

c1713d53f0392fc87ffbba73d551664a1c0d3033