From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 23 May 2010 12:00:47 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9af15c41e7fd27603e5d3586250f1dbe9580452f;p=thirdparty%2Fsquid.git

Merge from trunk
---

9af15c41e7fd27603e5d3586250f1dbe9580452f