From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 6 Nov 2008 13:38:10 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a91e7367c36b3adf490b6e01296c6c5dbdb9896;p=thirdparty%2Fsquid.git

Merge from trunk
---

2a91e7367c36b3adf490b6e01296c6c5dbdb9896