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

Merged from trunk
---

bec8928a44579248348908d28e35fbd4029ef54d