Merge commit 'svn-vim' into vim
commitdf976c830b4284c129cbb9b684ef7b4edc4f2723
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 28 Dec 2008 15:51:55 +0000 (28 16:51 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 28 Dec 2008 15:51:55 +0000 (28 16:51 +0100)
tree2af25f7b6a89e04297bcc8f3c804801bf8a68281
parentb8d6a18278e0641bee180ad7197f1e4456d385d9
parent6274fdeb81088173634f38678d7f82dbb16aed9e
Merge commit 'svn-vim' into vim

Conflicts:

runtime/doc/options.txt
runtime/doc/eval.txt
runtime/doc/options.txt