From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 23 Sep 2008 13:57:01 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68bc153abc2382737c116e67042e1a8271dd2021;p=thirdparty%2Fsquid.git

Merge from trunk
---

68bc153abc2382737c116e67042e1a8271dd2021