From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 19 Dec 2016 14:10:52 +0000 (+1300)
Subject: Merge from 5.0.0 r14981
X-Git-Tag: M-staged-PR71~333^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=030ff4221fa741e1ec4b08ac69498b6528269e38;p=thirdparty%2Fsquid.git

Merge from 5.0.0 r14981
---

030ff4221fa741e1ec4b08ac69498b6528269e38