Merge branch 'haproxy' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Oct 2018 10:59:18 +0000 (11:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Oct 2018 10:59:18 +0000 (11:59 +0100)

Trivial merge