Merge pull request #1069 from donaldsharp/rfc_plist

author Philippe Guibert <philippe.guibert@6wind.com>

Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)

committer GitHub <noreply@github.com>

Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)
author Philippe Guibert <philippe.guibert@6wind.com>
Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)
committer GitHub <noreply@github.com>
Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)
diff --cc configure.ac
Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
diff --cc pimd/pim_rp.c
Simple merge
author	Philippe Guibert <philippe.guibert@6wind.com>
	Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)
committer	GitHub <noreply@github.com>
	Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_rp.c	patch \|	diff1 \|	diff2 \|	blob \| history