Merge branch 'vim'
commitaef7ea3f258ba9b4b75859724ab3ef3b030a69b9
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 22 Mar 2009 20:05:08 +0000 (22 21:05 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 22 Mar 2009 20:05:08 +0000 (22 21:05 +0100)
tree5dddcecdcc1f4999a9a541e0f1d5c4109daee3f3
parent2adfdae3529e977cf0c97b2f268b1221dd4e163f
parent59b7163b7388755a14c30f62be45d18e42951b88
Merge branch 'vim'

Conflicts:
runtime/doc/change.txt
runtime/doc/change.txt
runtime/doc/eval.txt
runtime/doc/index.txt
runtime/doc/options.txt
runtime/doc/tags
runtime/menu.vim
runtime/syntax/vim.vim