From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 7 Apr 2008 09:40:58 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8ac3f16672ba4c9400462d408d26c121801722f;p=thirdparty%2Fsquid.git

Merged from trunk
---

f8ac3f16672ba4c9400462d408d26c121801722f