From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 16 Oct 2014 09:36:21 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?p=people%2Ftrikolon%2Fipfire-2.x.git;a=commitdiff_plain;h=4091a94508e8d4485c98dd64c5a3fe1c7282986c

Merge branch 'next'

Conflicts:
	make.sh
---

4091a94508e8d4485c98dd64c5a3fe1c7282986c