From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 10 Sep 2008 15:21:27 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~15^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7388e710644ca1862db82d1268a7d20f136f8dcf;p=thirdparty%2Fsquid.git

Merge from trunk
---

7388e710644ca1862db82d1268a7d20f136f8dcf