From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Jul 2010 16:28:31 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a47fbcc4d1596e6e4c94d7b9a46f83431f8f1158;p=thirdparty%2Fsquid.git

Merge from trunk
---

a47fbcc4d1596e6e4c94d7b9a46f83431f8f1158