Merge commit 'svn-vim' into vim
commit5aa59c5f115a0e10b4ab0f8d782b682cf8f73f3b
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 1 Jun 2008 19:35:46 +0000 (1 21:35 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 1 Jun 2008 19:35:46 +0000 (1 21:35 +0200)
treedaa208cfc916732b4447836c54874e12295098bd
parent7e01a9b3ba7d11affefde93036ccfa9ca4ff8b43
parent8207c139b13f3f3204918d84f47c4f758347779f
Merge commit 'svn-vim' into vim

Conflicts:

runtime/doc/eval.txt
runtime/doc/eval.txt
runtime/filetype.vim