From: Arne Fitzenreiter <arne_f@git.ipfire.org>
Date: Tue, 29 Jul 2014 20:01:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f0728c790ffce0acc5373bc340596a5e9974c8c1

Merge remote-tracking branch 'origin/master' into next

Conflicts:
	config/cfgroot/general-functions.pl
---

f0728c790ffce0acc5373bc340596a5e9974c8c1