From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 30 Nov 2016 23:16:16 +0000 (+0000)
Subject: Merge from trunk
X-Git-Tag: M-staged-PR71~356^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10f906a16b4c82ce2d0711af8b961145c51b5493;p=thirdparty%2Fsquid.git

Merge from trunk
---

10f906a16b4c82ce2d0711af8b961145c51b5493