]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'install-raid' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 4 Sep 2014 16:11:00 +0000 (18:11 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 4 Sep 2014 16:11:00 +0000 (18:11 +0200)
commitdf62453e9c1010a7e7731e8583aa393ee7e86b5a
tree39bebebedcc384ed99218bdefb847a3f3fa7df18
parented8977a1a069d9bbb627e6a89994610d35c56979
parent3ef5dd987189b4aadb348debc1dc586210739ab6
Merge branch 'install-raid' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into grub-unifont

Conflicts:
config/rootfiles/common/i586/grub
config/rootfiles/common/i586/grub
lfs/grub