From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 12 Sep 2008 08:52:35 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~15^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15073a5d91dedc1eacebee24af74e979b3a7d15f;p=thirdparty%2Fsquid.git

Merge from trunk
---

15073a5d91dedc1eacebee24af74e979b3a7d15f