From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 16 Mar 2008 00:53:56 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~3^2^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9529dd2b0cb2e8aee2d7de5835168834f82e97;p=thirdparty%2Fsquid.git

Merged from trunk
---

3d9529dd2b0cb2e8aee2d7de5835168834f82e97