Merge branch 'vim'
commit68e4f6cf3191767d79afb0205f8e6d2249c1ec5a
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Jun 2009 21:34:16 +0000 (24 23:34 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Jun 2009 21:34:16 +0000 (24 23:34 +0200)
treed264639487de3a0ca90995ff24b91f6da61ffc11
parent15fb691339d69763d729c066ae039e0e3db6df6d
parentb6ce21acbeb60a1fe05e017736b5975084330975
Merge branch 'vim'

Conflicts:
runtime/doc/autocmd.txt
runtime/doc/autocmd.txt