From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 6 Jan 2015 22:57:14 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~345^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24eba182e522b84a71556eb4d5d3395c21d057b5;p=thirdparty%2Fsquid.git

Merged from trunk
---

24eba182e522b84a71556eb4d5d3395c21d057b5