From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 22 Jun 2015 04:14:58 +0000 (-0700)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~72^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a36cbad8addcb7eb068bf2594a588aa67fa8ad74;p=thirdparty%2Fsquid.git

Merged from trunk
---

a36cbad8addcb7eb068bf2594a588aa67fa8ad74