Merge branches 'hack-vimdiff-to-left', 'repeat-annotate-with-predecessor', 'hack-special-git-blame', 'additional-hooks' and 'enh-annotate'

Conflicts:
	plugin/vcscommand.vim
Merge branch 'support-svn-blame-g-sigil'