From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 15 Feb 2014 16:48:35 +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~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=841193ead5980056d913346dca5ef5f2412db520

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

841193ead5980056d913346dca5ef5f2412db520