Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
	ChangeLog
This commit is contained in:
Vladimir Serbinenko 2013-11-16 16:17:46 +01:00
commit ab4366fd49

Diff content is not available