From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 3 Jan 2015 10:42:48 +0000 (+0100)
Subject: Merge splayfix branch
X-Git-Tag: merge-candidate-3-v1~384
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43fb53967b4be4911dd5df1c60f3bdba64bcb0a6;p=thirdparty%2Fsquid.git

Merge splayfix branch
---

43fb53967b4be4911dd5df1c60f3bdba64bcb0a6