Merge pull request #37 from LabNConsulting/working/2.0/patch-set-170102a

author David Lamparter <equinox@diac24.net>

Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)

committer GitHub <noreply@github.com>

Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)
author David Lamparter <equinox@diac24.net>
Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)
committer GitHub <noreply@github.com>
Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc lib/command.c
Simple merge
diff --cc lib/log.c
Simple merge
diff --cc lib/route_types.pl
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)
committer	GitHub <noreply@github.com>
	Tue, 3 Jan 2017 15:44:44 +0000 (16:44 +0100)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/route_types.pl	patch \|	diff1 \|	diff2 \|	blob \| history