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

Merged from trunk
---

36a70a7deb618545fb2fd0e4be21fdf701c27e16