From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 7 Nov 2009 15:56:34 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~472^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac4fffa55299308c24f0148f4c16a8ff9b0b02c4;p=thirdparty%2Fsquid.git

Merge from trunk
---

ac4fffa55299308c24f0148f4c16a8ff9b0b02c4