From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 1 Jun 2017 17:19:54 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core112~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3acfbc1c7f409974b5f7ab29cdda7f94e779588;p=people%2Fstevee%2Fipfire-2.x.git

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

e3acfbc1c7f409974b5f7ab29cdda7f94e779588