From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 25 Mar 2008 15:42:04 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~3^2^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e2115865d8eed167c9dc8636e9aa5fb7e9d5016;p=thirdparty%2Fsquid.git

Merged from trunk
---

4e2115865d8eed167c9dc8636e9aa5fb7e9d5016