Merge remote branch 'svn-vim' into vim
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 27 Mar 2010 16:51:38 +0000 (27 17:51 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 27 Mar 2010 16:51:38 +0000 (27 17:51 +0100)
Conflicts:
runtime/plugin/gzip.vim

1  2 
runtime/doc/eval.txt

Simple merge