From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 14 Sep 2009 02:33:31 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~668^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a9ea6b026aa36bb953192f80f27052399041b53;p=thirdparty%2Fsquid.git

Merge from trunk
---

9a9ea6b026aa36bb953192f80f27052399041b53