Merge branch 'master' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 12:52:30 +0000 (14:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 12:52:30 +0000 (14:52 +0200)
Conflicts:
config/rootfiles/common/bash
lfs/bash

1  2 
make.sh

diff --cc make.sh
Simple merge