Merge branch 'vim'
commit3c8981a5ecfbd6064030190c592698196fd10a7e
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 9 Jul 2009 21:52:47 +0000 (9 23:52 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 9 Jul 2009 21:52:47 +0000 (9 23:52 +0200)
tree568de58eaa624c899df5b001f4c21fee9d33741d
parent42a25962871d3361db2770695c11058bc578902d
parent1e925c2b1f58d3d979289eb07f12a1e2a5a6a6f4
Merge branch 'vim'

Conflicts:
runtime/doc/various.txt
runtime/doc/various.txt