From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 22 Aug 2008 13:14:46 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~59^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676b5d644b95b033f0eb4e8a994a7236db2a9d25;p=thirdparty%2Fsquid.git

Merged from trunk
---

676b5d644b95b033f0eb4e8a994a7236db2a9d25