From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 11 Dec 2013 01:32:21 +0000 (-0800)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae0a509c93db92966ab824f1e09c2717a413b470;p=thirdparty%2Fsquid.git

Merged from trunk
---

ae0a509c93db92966ab824f1e09c2717a413b470