From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 Feb 2015 13:56:23 +0000 (-0800)
Subject: Merge from trynk rev.13918
X-Git-Tag: merge-candidate-3-v1~270^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=163ae26957d4e781050b8234d13fe82bc0870e35;p=thirdparty%2Fsquid.git

Merge from trynk rev.13918
---

163ae26957d4e781050b8234d13fe82bc0870e35