From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 20 Dec 2016 10:46:00 +0000 (+1300)
Subject: Merged from 5.0.0-r14982
X-Git-Tag: M-staged-PR71~333^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d421f7864c50e8ec0c9124ab7e57563fc348517;p=thirdparty%2Fsquid.git

Merged from 5.0.0-r14982
---

4d421f7864c50e8ec0c9124ab7e57563fc348517