From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 23 Dec 2013 12:18:49 +0000 (-0800)
Subject: Merged from trunk rev.13197
X-Git-Tag: merge-candidate-3-v1~506^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6249814439d6e42024c3080eadd0d272cd9cea7b;p=thirdparty%2Fsquid.git

Merged from trunk rev.13197
---

6249814439d6e42024c3080eadd0d272cd9cea7b