From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 6 Apr 2008 01:34:08 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~3^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59bfd4da40d9c6ecfeeb84878f78577467cd7f6d;p=thirdparty%2Fsquid.git

Merged from trunk
---

59bfd4da40d9c6ecfeeb84878f78577467cd7f6d