From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 22 May 2015 09:59:09 +0000 (-0700)
Subject: Merged from trunk rev.14084
X-Git-Tag: merge-candidate-3-v1~109^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bc61a2cf419fc483e8ef890fdf8d58545306948;p=thirdparty%2Fsquid.git

Merged from trunk rev.14084
---

1bc61a2cf419fc483e8ef890fdf8d58545306948