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

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

421db3da060fccef6d77ba150b49fe624719b51b
diff --cc ChangeLog
index 68694c7bd,2c43f6a9a..e1a7d8f0b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* Makefile.am (default_payload.elf): Add pata to loaded modules.
 +	Load config file from (cbfsdisk)/etc/grub.cfg.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* util/grub-install-common.c (grub_install_copy_files): Fix module
 +	destination directory.
 +
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo
+ 	files have not been built.
+ 
  2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
  
  	* grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):