Merge branch 'feature/fifo'.

author Daniel Carl <danielcarl@gmx.de>

Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)

committer Daniel Carl <danielcarl@gmx.de>

Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)
author Daniel Carl <danielcarl@gmx.de>
Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)
committer Daniel Carl <danielcarl@gmx.de>
Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)
diff --cc doc/vimb.1
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/main.h
Simple merge
author	Daniel Carl <danielcarl@gmx.de>
	Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)
committer	Daniel Carl <danielcarl@gmx.de>
	Sat, 22 Nov 2014 23:29:40 +0000 (00:29 +0100)
		1	2
doc/vimb.1	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.h	patch \|	diff1 \|	diff2 \|	blob \| history