From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 26 Jun 2016 15:30:29 +0000 (+1200)
Subject: Merge form trunk rev.14722
X-Git-Tag: SQUID_4_0_13~39^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb304f5b158cc7228393acbfdc0343cccdd5cc6;p=thirdparty%2Fsquid.git

Merge form trunk rev.14722
---

0cb304f5b158cc7228393acbfdc0343cccdd5cc6