From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 13 Jul 2014 04:14:23 +0000 (-0700)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_5_0_1~75^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c85efb4b93657f1a3b560b29c0cddf09dc49f2be;p=thirdparty%2Fsquid.git

Merged from trunk
---

c85efb4b93657f1a3b560b29c0cddf09dc49f2be