Merge branch 'master' into feature/autocmd

author Daniel Carl <danielcarl@gmx.de>

Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)

committer Daniel Carl <danielcarl@gmx.de>

Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)
author Daniel Carl <danielcarl@gmx.de>
Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)
committer Daniel Carl <danielcarl@gmx.de>
Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)
diff --cc doc/vimb.1
Simple merge
diff --cc src/main.c
Simple merge
author	Daniel Carl <danielcarl@gmx.de>
	Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)
committer	Daniel Carl <danielcarl@gmx.de>
	Sat, 20 Sep 2014 22:34:04 +0000 (00:34 +0200)
		1	2
doc/vimb.1	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history