From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Oct 2014 21:39:20 +0000 (+0200)
Subject: Merge branch 'install-raid' into seventeen
X-Git-Tag: v2.17-core87~103^2~51
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=6e0b26ba7db9d1faa5eb564b07d617c78d8ab0ef

Merge branch 'install-raid' into seventeen

Conflicts:
	make.sh
---

6e0b26ba7db9d1faa5eb564b07d617c78d8ab0ef