From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 14 Sep 2016 15:41:38 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core106~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48b1876a48ae485f371fe6baa5fe3c1d000ef7d8;p=ipfire-2.x.git

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

48b1876a48ae485f371fe6baa5fe3c1d000ef7d8