From: Arne Fitzenreiter <Arne_F@ipfire.org>
Date: Wed, 3 Jul 2013 16:38:16 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2650b1d285a3cb60808a4fbf386f7c65b2dfa29f;hp=-c

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

2650b1d285a3cb60808a4fbf386f7c65b2dfa29f