Merge branch 'vim'
commitc42b257a2779f75a43d60534f3a2d5a3c0bd6663
authorMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 14 May 2010 23:54:41 +0000 (15 01:54 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 14 May 2010 23:54:41 +0000 (15 01:54 +0200)
treeb8a2d86448c8f46934a25896825e5042c93407ef
parentc2eac67ff505744a066fccd38e7dd430ae8fae67
parent2abdc23486334a4f5137092236547806026e4101
Merge branch 'vim'

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