Merge pull request #27 from qlyoung/fix-derefs2

author Donald Sharp <sharpd@cumulusnetworks.com>

Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)

committer GitHub <noreply@github.com>

Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)
committer GitHub <noreply@github.com>
Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc lib/command.c
Simple merge
diff --cc lib/routemap.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)
committer	GitHub <noreply@github.com>
	Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history