From: Arne Fitzenreiter <Arne_F@ipfire.org>
Date: Mon, 3 Jun 2013 12:49:29 +0000 (+0200)
Subject: Merge branch 'next' of ssh://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=e8676927f429f94197d8a4d8daff247de799b0b4

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

e8676927f429f94197d8a4d8daff247de799b0b4