Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng

author David Lamparter <equinox@opensourcerouting.org>

Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)

committer David Lamparter <equinox@opensourcerouting.org>

Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
author David Lamparter <equinox@opensourcerouting.org>
Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
committer David Lamparter <equinox@opensourcerouting.org>
Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc lib/bitfield.h
Simple merge
author	David Lamparter <equinox@opensourcerouting.org>
	Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
committer	David Lamparter <equinox@opensourcerouting.org>
	Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/bitfield.h	patch \|	diff1 \|	diff2 \|	blob \| history