From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 20 Apr 2019 15:35:54 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7a52c52d109e044bcce0ca52eb0b5a94c2ec03a;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
---

e7a52c52d109e044bcce0ca52eb0b5a94c2ec03a