From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 16 Jul 2013 21:05:00 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core72^2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7;p=ipfire-2.x.git

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

b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7