From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 29 Oct 2016 21:51:00 +0000 (+1300)
Subject: Merged from trunk rev.14899
X-Git-Tag: M-staged-PR71~284^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f5225ac3d67c99f6bd143c6dd4fbb63f9281670;p=thirdparty%2Fsquid.git

Merged from trunk rev.14899
---

5f5225ac3d67c99f6bd143c6dd4fbb63f9281670