From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 29 May 2014 17:40:02 +0000 (+0300)
Subject: merge from trunk
X-Git-Tag: SQUID_3_5_0_1~117^2~15^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e621268f3b76ef70b4c721efe60948a0ee983f5c;p=thirdparty%2Fsquid.git

merge from trunk
---

e621268f3b76ef70b4c721efe60948a0ee983f5c