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

Merged from trunk
---

ab65f1f21cadf899a6fe92f138a5fb62690446b1