From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 29 Jan 2014 22:40:11 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: 2.02-beta3~674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3beabdc8e4e803316afeff6aa93556b08317ed8e;p=thirdparty%2Fgrub.git

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

Conflicts:
	ChangeLog
---

3beabdc8e4e803316afeff6aa93556b08317ed8e
diff --cc ChangeLog
index d37d4a6fc,b996df81c..5692a5b7a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
- 2014-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
++2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
 +
+ 2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+ 
+ 	* .gitignore: add missing files and .exe variants.
+ 
  2014-01-26  Mike Gilbert <floppym@gentoo.org>
  
  	grub-install: support for partitioned partx loop devices.