From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 27 May 2010 01:56:23 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3014ba34f01fc434dfe18531a17e03bad219fb;p=thirdparty%2Fsquid.git

Merge from trunk
---

fa3014ba34f01fc434dfe18531a17e03bad219fb