06628ab Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2

Merged and Committed by pjones 12 years ago
1 file changed. 4 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2
    
    Conflicts:
    	grub2.spec
    
        
file modified
+4 -2