From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Jul 2015 08:42:56 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v2.17-core92~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15d5073d5b5599897bb304785f812f5259ad9d80;p=ipfire-2.x.git

Merge branch 'next'
---

15d5073d5b5599897bb304785f812f5259ad9d80