From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 3 Oct 2010 15:00:39 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: take08~55^2~124^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a506e2b504919844d3707561c556e3ff9893290;p=thirdparty%2Fsquid.git

Merged from trunk
---

7a506e2b504919844d3707561c556e3ff9893290