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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 179bc3c03760bad75ab5c3677e159a83e326e518,7a102649936b5838bd0ba29196ad2997bdb304a8..ba50cfb68f4251d3a3ddbd92bb457b4a50324b00
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,9 +1,27 @@@
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/genmod.sh.in: Strip before converting to ELF as strip
 +      may not work with ELF.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Use unix functions for temporary files and special files on cygwin.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Define functions explicitly rather than using --defsym in tests
 +      whenever possible. Respect locality in remaining cases.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/genmoddep.awk: Remove explicit getline < /dev/stdin.
 +
+ 2013-12-15  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+       * grub-core/osdep/windows/platform.c (grub_install_register_efi): Handle
+       unlikely errors when getting EFI variables and make exhaustive search
+       for all BootNNNN variables to find matching one.
+ 
  2013-12-15  Ian Campbell  <ijc@hellion.org.uk>
  
        * grub-core/kern/uboot/init.c: Fix units of uboot timer.