From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Apr 2016 20:48:32 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core101~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56f2056c67c5d73d60fa6507e6ba980064610c7e;p=people%2Fpmueller%2Fipfire-2.x.git

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

56f2056c67c5d73d60fa6507e6ba980064610c7e