From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 12 Oct 2011 16:58:09 +0000 (+0000)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-core54~13^2~32
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=edca3131f205a3fbdb247e3814f3ee16dcd43869

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

edca3131f205a3fbdb247e3814f3ee16dcd43869