From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Oct 2018 10:59:18 +0000 (+0100)
Subject: Merge branch 'haproxy' into next
X-Git-Tag: v2.21-core125~39
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3ed2de12510dcca5dea8e96b02f785cb0f8fe10c

Merge branch 'haproxy' into next
---

3ed2de12510dcca5dea8e96b02f785cb0f8fe10c