From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 29 Nov 2008 06:44:51 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adcb66d8ae5845daab562d42d43da3b35795b557;p=thirdparty%2Fsquid.git

Merge from trunk
---

adcb66d8ae5845daab562d42d43da3b35795b557