From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Nov 2013 15:17:46 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4366fd49bef70a5e62b3b73e7f14e1a7819c7f;p=thirdparty%2Fgrub.git

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

Conflicts:
	ChangeLog
---

ab4366fd49bef70a5e62b3b73e7f14e1a7819c7f