From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Tue, 4 Dec 2012 10:17:43 +0000 (+0200)
Subject: merge from trunk r12500
X-Git-Tag: SQUID_3_4_0_1~460^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcb9f68855ed476199bcfb749641bfdc0c065eec;p=thirdparty%2Fsquid.git

merge from trunk r12500
---

bcb9f68855ed476199bcfb749641bfdc0c065eec