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)
commit6e0b26ba7db9d1faa5eb564b07d617c78d8ab0ef
tree91e19aecfc1571dfae7999d5d2c4ba2f4f5ea211
parentdadfa436c9fbe800b1060e673bc17d96ef827874
parent38c6822d3c99104978975352bcfe80fb13a94c72
Merge branch 'install-raid' into seventeen

Conflicts:
make.sh
doc/language_missings
make.sh