From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 8 Feb 2009 05:20:15 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1192^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3c082dc5d56d2649288e5eb03f399b5829a1ccd;p=thirdparty%2Fsquid.git

Merge from trunk
---

c3c082dc5d56d2649288e5eb03f399b5829a1ccd