Merged from "branches/vim7.1".
commit40637cec773ab74c41bafe8fa2b87c679b3243ee
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 12 May 2007 04:45:58 +0000 (12 04:45 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 12 May 2007 04:45:58 +0000 (12 04:45 +0000)
treef32589b158b8b636e7f137b4ccba42cf828b30e7
parentc19812b7fb5867dc1d69cf4c12dfa82a4ce55887
Merged from "branches/vim7.1".

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