From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 5 Nov 2009 09:49:21 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e18c9d8eb7c15d575c29e7ce0cccbb26320cde5c;p=thirdparty%2Fsquid.git

Merged from trunk
---

e18c9d8eb7c15d575c29e7ce0cccbb26320cde5c