From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sat, 22 Mar 2008 01:47:25 +0000 (+0100)
Subject: merged from trunk
X-Git-Tag: BASIC_TPROXY4~3^2^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8202c1ac4b50d4567129a9d96a2c9226b0fe5e98;p=thirdparty%2Fsquid.git

merged from trunk
---

8202c1ac4b50d4567129a9d96a2c9226b0fe5e98