[vim/f15: 196/196] Merge branch 'f15' of ssh://pkgs.fedoraproject.org/vim into f15

[Karsten Hopp]

commit 8a311dba0611e6180870754b481fd0823e115ddc
Merge: 9d9845b 5b2e52e
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Aug 29 14:18:08 2011 +0200

    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/vim into f15
    
    Conflicts:
    	README.patches
    	vim.spec

---