Merge commit 'svn-vim' into vim
commitec028014dfadb2ac27c4d208e3bec495d8cfe84f
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 7 Jun 2008 12:59:28 +0000 (7 14:59 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 7 Jun 2008 12:59:28 +0000 (7 14:59 +0200)
tree13b60ed456823e2d641f613eda14f453e40f1d05
parent0ddc948ddd3272ba687a80ee42ceea766f23982b
parentcea4ab3f781cf070d571d8684af2a10fbd4cac1a
Merge commit 'svn-vim' into vim

Conflicts:

runtime/optwin.vim