From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Feb 2016 01:33:15 +0000 (+0000)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core100~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=067db4d53abbaeaaaaf46515ee834c78f1bf235b;p=ipfire-2.x.git

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

067db4d53abbaeaaaaf46515ee834c78f1bf235b