From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 4 Sep 2014 16:11:00 +0000 (+0200)
Subject: Merge branch 'install-raid' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df62453e9c1010a7e7731e8583aa393ee7e86b5a;p=people%2Fms%2Fipfire-2.x.git

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
---

df62453e9c1010a7e7731e8583aa393ee7e86b5a
diff --cc config/rootfiles/common/i586/grub
index bdb18eb226,d3c48af9fc..9d71942523
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@@ -1,6 -1,6 +1,7 @@@
  #boot/grub
  boot/grub/grub.cfg
+ boot/grub/splash.png
 +boot/grub/unifont.pf2
  #etc/bash_completion.d
  #etc/bash_completion.d/grub
  etc/default/grub