From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 12 Feb 2010 11:00:13 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~421^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd95e8d33eef1daff283dbffb31aee88f6567441;p=thirdparty%2Fsquid.git

Merge from trunk
---

cd95e8d33eef1daff283dbffb31aee88f6567441