From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Sat, 24 Nov 2012 15:12:32 +0000 (+0200)
Subject: merge from parent
X-Git-Tag: SQUID_3_4_0_1~458^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f1035b7153a9ffa5c0981cb13d7f8afcbe7419;p=thirdparty%2Fsquid.git

merge from parent
---

62f1035b7153a9ffa5c0981cb13d7f8afcbe7419