From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 12 Jun 2009 05:10:28 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~960^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0f7505bc7a8293c938a2b43758c6c18d24095bd;p=thirdparty%2Fsquid.git

Merge from trunk
---

e0f7505bc7a8293c938a2b43758c6c18d24095bd