From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 18 Dec 2013 06:19:15 +0000 (-0800)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c0789515bcb14f72b140397395396ef14741914;p=thirdparty%2Fsquid.git

Merged from trunk
---

2c0789515bcb14f72b140397395396ef14741914