Merge remote-tracking branch 'origin/next' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 11:36:39 +0000 (13:36 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge