From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 8 Apr 2016 15:16:57 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core101~18
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad

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

36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad