From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 27 Aug 2014 07:38:09 +0000 (+0300)
Subject: merge from trunk
X-Git-Tag: SQUID_3_5_0_1~89^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e62cd8775ba703588ff2bccb0b1b0040272588e;p=thirdparty%2Fsquid.git

merge from trunk
---

1e62cd8775ba703588ff2bccb0b1b0040272588e