From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Sep 2009 08:05:55 +0000 (+1200)
Subject: Merge with trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9064c53c07cf3b94f28fad7915517b9d3679a5c;p=thirdparty%2Fsquid.git

Merge with trunk
---

b9064c53c07cf3b94f28fad7915517b9d3679a5c