Merge pull request #1387 from donaldsharp/save_zserv_incoming

author Renato Westphal <renato@openbsd.org>

Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)

committer GitHub <noreply@github.com>

Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)
author Renato Westphal <renato@openbsd.org>
Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)
committer GitHub <noreply@github.com>
Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)
diff --cc configure.ac
Simple merge
diff --cc zebra/zserv.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)
committer	GitHub <noreply@github.com>
	Tue, 21 Nov 2017 11:06:06 +0000 (09:06 -0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	patch \|	diff1 \|	diff2 \|	blob \| history