From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 28 Apr 2010 05:21:24 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a55fd762c59be64e5b4ea48634c340fe2fc5154;p=thirdparty%2Fsquid.git

Merge from trunk
---

1a55fd762c59be64e5b4ea48634c340fe2fc5154