From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Dec 2013 23:14:12 +0000 (+0100)
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=9fa18495864b421b508201870abe93acc5a35b7c

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

9fa18495864b421b508201870abe93acc5a35b7c