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

merge from trunk r13423
---

ba1b862c8e2fb4ac6002432c2f16041119c02758