From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Oct 2016 21:34:23 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core106~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8;p=people%2Fstevee%2Fipfire-2.x.git

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

574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8