Merge pull request #673 from deferraz/master

author Pierre-Yves Ritschard <pyr@spootnik.org>

Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)

committer Pierre-Yves Ritschard <pyr@spootnik.org>

Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)
author Pierre-Yves Ritschard <pyr@spootnik.org>
Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)
committer Pierre-Yves Ritschard <pyr@spootnik.org>
Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)
diff --cc src/tail.c
Simple merge
diff --cc src/utils_match.c
Simple merge
diff --cc src/utils_match.h
Simple merge
author	Pierre-Yves Ritschard <pyr@spootnik.org>
	Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)
committer	Pierre-Yves Ritschard <pyr@spootnik.org>
	Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)
		1	2
src/tail.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_match.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_match.h	patch \|	diff1 \|	diff2 \|	blob \| history