4d616a Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim

Merged and Committed by Karsten Hopp 9 years ago
1 file changed. 5 lines added. 1 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim
    
    Conflicts:
    	vim.spec
    
        
file modified
+5 -1