From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 3 Feb 2015 06:27:03 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730
X-Git-Tag: v2.17-core89~71
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2c9c92f4651fccdb18daa4da8adef5d1d4d9a716

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

2c9c92f4651fccdb18daa4da8adef5d1d4d9a716