From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 6 Jun 2009 11:50:57 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~968^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7589d71c7a440fc09c223ba992b24beb97a4986b;p=thirdparty%2Fsquid.git

Merged from trunk
---

7589d71c7a440fc09c223ba992b24beb97a4986b