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

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

cdce14908d3ed37bb4207f57dea843705ec10283