From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Nov 2008 12:05:58 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0101752fcb08162d6da242cf01439b1f38359f38;p=thirdparty%2Fsquid.git

Merge from trunk
---

0101752fcb08162d6da242cf01439b1f38359f38