]> git.ipfire.org Git - thirdparty/grub.git/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
authorVladimir Serbinenko <phcoder@gmail.com>
Sat, 16 Nov 2013 15:17:46 +0000 (16:17 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Sat, 16 Nov 2013 15:17:46 +0000 (16:17 +0100)
commitab4366fd49bef70a5e62b3b73e7f14e1a7819c7f
tree003bfb7d6d553e9bd8bc6e8d9c6415a8d82ff32a
parente6a6182d95d26871a7d34af66899ae2b0f9b5b75
parentdeaa7052c5161f54b42da0c887d08fddfa1130d7
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
ChangeLog