From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 26 Jul 2009 05:54:56 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~668^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb05fa44dee586ae2e5a8d445bc9ef06b3b45873;p=thirdparty%2Fsquid.git

Merge from trunk
---

fb05fa44dee586ae2e5a8d445bc9ef06b3b45873