From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 14 Feb 2014 22:41:45 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-beta2~3^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bf58b324c24be0a43b15a55304958b6e02937fb;p=ipfire-2.x.git

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

3bf58b324c24be0a43b15a55304958b6e02937fb