]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline
authorColin Watson <cjwatson@ubuntu.com>
Thu, 17 Jun 2010 15:14:08 +0000 (16:14 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Thu, 17 Jun 2010 15:14:08 +0000 (16:14 +0100)
1  2 
docs/grub.texi
util/grub-mkconfig.in

diff --cc docs/grub.texi
Simple merge
Simple merge