46d49d Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim

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