[aur-general] Merge grub-bios-bzr and grub-efi-x86_64-bzr into grub-bzr