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

Merged from trunk
---

5673a742dff321b2e56eee139e427861201dd235