a9b328 Merge commit '328405c9f5f69dd1f41d5c0a742ad64bd19698de'

Merged and Committed by adamwill 8 years ago
1 file changed. 13 lines added. 1 lines removed.
    Merge commit '328405c9f5f69dd1f41d5c0a742ad64bd19698de'
    
    Conflicts:
    	grub2.spec
    
        
file modified
+13 -1