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

Merged and Committed by Karsten Hopp 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim
    
    Conflicts:
    	vim.spec
    
        
file modified
+8 -2