Merged from the latest developing branch.
commitc2f071c724a1fc83533a95275b503b7e991451d0
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Mar 2008 02:22:54 +0000 (12 02:22 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Mar 2008 02:22:54 +0000 (12 02:22 +0000)
treeec1d51e15c02fd7d8f0ddae0236914347a74bcc0
parent7e54c07f58569fed26c79ce7c8e39e31b524e6d3
Merged from the latest developing branch.

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