From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 5 Feb 2013 21:37:05 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18b39b38aed96e348b3996f7e69aed88c7c95d4f;p=ipfire-2.x.git

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

18b39b38aed96e348b3996f7e69aed88c7c95d4f