From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 26 Oct 2014 19:11:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/seventeen' into seventeen
X-Git-Tag: v2.17-core87~103^2~43
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=57629914e8dd6559c163093312bd51adf677ddb7

Merge remote-tracking branch 'origin/seventeen' into seventeen

Conflicts:
	make.sh
---

57629914e8dd6559c163093312bd51adf677ddb7