Merge pull request #935 from donaldsharp/kernel_metric

author David Lamparter <equinox@diac24.net>

Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)

committer GitHub <noreply@github.com>

Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)
author David Lamparter <equinox@diac24.net>
Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)
committer GitHub <noreply@github.com>
Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)
diff --cc zebra/redistribute.c
Simple merge
diff --cc zebra/zserv.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)
committer	GitHub <noreply@github.com>
	Tue, 15 Aug 2017 11:42:04 +0000 (13:42 +0200)
		1	2
zebra/redistribute.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	patch \|	diff1 \|	diff2 \|	blob \| history