alt case
Merge branch 'master' of github.com:MarcWeber/vim-git-wiki

* 'master' of github.com:MarcWeber/vim-git-wiki:
  by  - online
  by  - online

Conflicts:
	vim-online-wiki-source/vim-development/breaking-with-the-past