Merge commit 'svn-vim' into vim
commit215e29b304c7f50e8ca31308086910583be0fba8
authorBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 10 Nov 2008 20:23:35 +0000 (10 21:23 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 10 Nov 2008 20:23:35 +0000 (10 21:23 +0100)
tree9409db6ef9f39246783795ba5880cd226d5fd0ab
parent8df0536f444108182586180a9b655c62ab1b1fcc
parentc0a1a77705a7f1eaa291c6f4d9470e9ed21ffd4a
Merge commit 'svn-vim' into vim

Conflicts:

runtime/doc/starting.txt
runtime/doc/usr_21.txt
runtime/doc/starting.txt