From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 1 Nov 2009 01:20:30 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7300185a8d8a6c0e1e3268632c85378e0e50a0dd;p=thirdparty%2Fsquid.git

Merge from trunk
---

7300185a8d8a6c0e1e3268632c85378e0e50a0dd