From: Matthias Fischer <fischerm@ipfire.org>
Date: Fri, 24 Apr 2015 22:32:20 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core92~10^2~2^2~19
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b;hp=0594323b79a4bf8ba390a4cd9a2c6833983174ac

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