Merge branch 'vim-messages'
commita2f17962df289cd78407bde82fe303fb3c63800c
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 1 Mar 2009 17:14:02 +0000 (1 18:14 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 1 Mar 2009 17:14:02 +0000 (1 18:14 +0100)
tree4d0d99b246d738c98d0effcedf768d45827509e2
parent590423f3d68ce3083ca70bcb31961c30b25674ff
parent759d340f1bea865da298f6b1acfbf0a396a9aec4
Merge branch 'vim-messages'

This is the initial merge of the messages branch, done with the
following commands:

    git merge -s ours --no-commit vim-messages
    git read-tree -u -m HEAD HEAD vim-messages
    git merge-index git-merge-vim-messages.sh -a
    git commit

All the following merges just need this command:

    git merge vim-messages