From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 6 Apr 2008 23:24:20 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~3^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=486de706f41e0b943c0b9887e8996164d421e915;p=thirdparty%2Fsquid.git

Merged from trunk
---

486de706f41e0b943c0b9887e8996164d421e915