]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into reloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 3 Mar 2012 20:47:00 +0000 (21:47 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 3 Mar 2012 20:47:00 +0000 (21:47 +0100)

Trivial merge