From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 8 Feb 2013 14:49:38 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8435c437d3f8990d47219e4804a96457cf1417b5;p=ipfire-2.x.git

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

8435c437d3f8990d47219e4804a96457cf1417b5