From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Nov 2012 12:53:57 +0000 (+1300)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_4_0_1~471^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31f2702c1559845c01bfa7693d883557c824fa31;p=thirdparty%2Fsquid.git

Merged from trunk
---

31f2702c1559845c01bfa7693d883557c824fa31