From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 4 Sep 2009 11:59:26 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ed5604ad07ade798a6273390206899c7059bce;p=thirdparty%2Fsquid.git

Merge from trunk
---

c1ed5604ad07ade798a6273390206899c7059bce