Merged from the latest developing branch.
commit07e11e40e8e34ec020dc94502c121293981757ef
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 11 Jun 2009 05:37:47 +0000 (11 05:37 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 11 Jun 2009 05:37:47 +0000 (11 05:37 +0000)
tree96059b34b66f6c7775d770677fde02c20abc5d0b
parentf419c2c790829be4856acfc1e479f8e0cb0cc30b
Merged from the latest developing branch.

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