From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Jan 2015 11:36:01 +0000 (-0800)
Subject: Merge from trunk rev.13875
X-Git-Tag: merge-candidate-3-v1~270^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=636a48b13b63bd7130c4b019f8d92ce93519e5a1;p=thirdparty%2Fsquid.git

Merge from trunk rev.13875
---

636a48b13b63bd7130c4b019f8d92ce93519e5a1