NixOS/nixpkgs — pull request #3892 by robberer (2014-08-31 10:32:16+00:00)
Title: grub: fix grub merge error

this is present since commit 94205f5