Merge remote-tracking branch 'ms/install-raid' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
Conflicts:
lfs/bash

1  2 
lfs/bash

diff --cc lfs/bash
Simple merge