Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
authorVladimir Serbinenko <phcoder@gmail.com>
Wed, 29 Jan 2014 22:40:11 +0000 (23:40 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Wed, 29 Jan 2014 22:40:11 +0000 (23:40 +0100)
commit3beabdc8e4e803316afeff6aa93556b08317ed8e
tree8ff6d60d55260dfb46faec3ec615d9809e323160
parent7f64fb590cd80517e1381693a16d7cf2486fa808
parentba584da163bc4dc2a36988ae327733ba10251143
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
ChangeLog
ChangeLog