From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 4 Oct 2009 10:47:28 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~668^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2273433ec7a166f5e80d14bb094400a795e87611;p=thirdparty%2Fsquid.git

Merge from trunk
---

2273433ec7a166f5e80d14bb094400a795e87611