Merge branch 'next' into efi
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Jul 2018 12:47:20 +0000 (12:47 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Jul 2018 12:47:20 +0000 (12:47 +0000)

Trivial merge