]> git.proxmox.com Git - grub2.git/commitdiff
Merge branch 'upstream' into experimental
authorColin Watson <cjwatson@debian.org>
Wed, 27 Nov 2013 10:26:17 +0000 (10:26 +0000)
committerColin Watson <cjwatson@debian.org>
Wed, 27 Nov 2013 10:26:17 +0000 (10:26 +0000)

Trivial merge