From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 14 Jan 2017 07:21:18 +0000 (+1300)
Subject: Merge from v5
X-Git-Tag: M-staged-PR71~284^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=713de0830cf9c7c26775ea9f3aae57be760149bb;p=thirdparty%2Fsquid.git

Merge from v5
---

713de0830cf9c7c26775ea9f3aae57be760149bb