Merge branch 'install-raid' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 21:39:20 +0000 (23:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 21:39:20 +0000 (23:39 +0200)
Conflicts:
make.sh

1  2 
doc/language_missings
make.sh

Simple merge
diff --cc make.sh
Simple merge