From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 20 Mar 2008 23:13:29 +0000 (+0100)
Subject: merged from trunk
X-Git-Tag: BASIC_TPROXY4~15^2~5^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffb5740587ee58c2d05d19ba3c37974df0f478d6;p=thirdparty%2Fsquid.git

merged from trunk
---

ffb5740587ee58c2d05d19ba3c37974df0f478d6