Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 16 Dec 2013 13:15:37 +0000 (14:15 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 16 Dec 2013 13:15:37 +0000 (14:15 +0100)
commitfadddc260a1c88855f7044fb2c7c99fd02c934de
treed0e405de45e0d060a119298efcd8453e193925a2
parent23d2abc33cde7f4430c9ee092d1c705f67e24478
parente477187bf4e935a43d858ab2d33c64e978e2448b
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
ChangeLog
ChangeLog