From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Jan 2014 02:09:53 +0000 (-0800)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23a533d9f660e949557c570587802fa11c802477;p=thirdparty%2Fsquid.git

Merge from trunk
---

23a533d9f660e949557c570587802fa11c802477