From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 30 Nov 2012 11:24:03 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_4_0_1~466^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ed10954554f5a960112aa5e5958fcb38973db3b;p=thirdparty%2Fsquid.git

Merged from trunk
---

2ed10954554f5a960112aa5e5958fcb38973db3b