From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 15 Sep 2008 14:51:57 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~18^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56fd239d0b384b17d2ae6748e79f50cd5c7e465c;p=thirdparty%2Fsquid.git

Merge from trunk
---

56fd239d0b384b17d2ae6748e79f50cd5c7e465c