From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 8 Aug 2008 08:07:10 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~106^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d118cf6325f72b54ee75de24b52c1dfdd1e4d9b6;p=thirdparty%2Fsquid.git

Merge from trunk
---

d118cf6325f72b54ee75de24b52c1dfdd1e4d9b6