From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 24 Jun 2013 13:05:43 +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=57648683a319bb50cd259600fa3b54042dfb6f70

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

57648683a319bb50cd259600fa3b54042dfb6f70