From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 4 Mar 2013 06:58:48 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core67~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ec41d5f9a65441d513517d6fc5693a615264cb4;p=ipfire-2.x.git

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

5ec41d5f9a65441d513517d6fc5693a615264cb4