From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Apr 2016 15:24:12 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core101~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fcba2b5df715041e4a9057e749de2faee46e508;p=ipfire-2.x.git

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

9fcba2b5df715041e4a9057e749de2faee46e508