Merged from the latest developing branch.
commitc26ae20bde4b6f31241f0f744fa970dd64aec2a8
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 8 Oct 2009 08:00:27 +0000 (8 08:00 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 8 Oct 2009 08:00:27 +0000 (8 08:00 +0000)
treeefb7e8c1021bdd270745455e8bf5ecb9d6b483a9
parenta750fd4002366729339ea9993e8717d37e78ee4a
Merged from the latest developing branch.

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