Merge branch 'vim'
commit9b7d6ff42f8a4b5444332a530573020951711e0d
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 5 Jul 2008 17:33:40 +0000 (5 19:33 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 5 Jul 2008 17:33:40 +0000 (5 19:33 +0200)
tree421c75b5e68215e5e0bee7627ff323a621344aca
parent50fd619f5883342c83413664168a6077a5b939ca
parent29b9636fcfbf47bff1d367b76fe866349756f43e
Merge branch 'vim'

Conflicts:

runtime/syntax/vim.vim
runtime/doc/eval.txt
runtime/doc/tags
runtime/doc/version7.txt
runtime/syntax/vim.vim