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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index d37d4a6fc16fb6f81a83ed3a88add667893bcbde,b996df81cadc96432ec7997acd92d39ba45b2c8e..5692a5b7a718d4e6732a5ff5a9a514096ee39d30
--- 1/ChangeLog
--- 2/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.