From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 17 Mar 2014 23:22:24 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=607c9d3ae05eaa5de02c51aa5923505f7c5026c3

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

607c9d3ae05eaa5de02c51aa5923505f7c5026c3