Merged from the latest developing branch.
commite662232347d938d7ea3dcc19fef4fc55962144b7
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 9 Jul 2008 02:34:45 +0000 (9 02:34 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 9 Jul 2008 02:34:45 +0000 (9 02:34 +0000)
tree2c42c07166bf85b62381cf9cef2c40b33d86b59d
parentad8aa431fc07bfaaa350a988987a0ac721a8c840
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1104 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/option.c
src/version.c