From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 12 Jan 2010 23:31:55 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~466^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=112ce8dd0a37ccea15d1c10d30dd1a34174ff50d;p=thirdparty%2Fsquid.git

Merge from trunk
---

112ce8dd0a37ccea15d1c10d30dd1a34174ff50d