Merge remote branch 'svn-vim' into vim
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 27 Mar 2010 16:51:38 +0000 (17:51 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 27 Mar 2010 16:51:38 +0000 (17:51 +0100)
commitf7d34a73803a3b6fb5cfefa230d5f817767f1470
treeba37f72e39fd46068e754e9e71ac4ee6622de278
parentc3db9d0ebcf6e7155a89d0c7f6194a0c4ff624de
parent94e9921b4da667e0e3438b6e7a4f8d52674c20b4
Merge remote branch 'svn-vim' into vim

Conflicts:
runtime/plugin/gzip.vim
runtime/doc/eval.txt