From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 5 Jun 2009 05:27:08 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~973^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de9a004eba2e59526451c2d89d2c3cccc6546c24;p=thirdparty%2Fsquid.git

Merged from trunk
---

de9a004eba2e59526451c2d89d2c3cccc6546c24