From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 16 Jan 2014 10:08:01 +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=03e7b65b0173ae1ee9e3a5f326eef04596da3b14;hp=-c

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

03e7b65b0173ae1ee9e3a5f326eef04596da3b14