From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Jul 2014 12:06:48 +0000 (-0700)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_5_0_1~75^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48d63967418da187ba505d5cd60dd038d7ee3073;p=thirdparty%2Fsquid.git

Merged from trunk
---

48d63967418da187ba505d5cd60dd038d7ee3073