]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge remote-tracking branch 'origin/stable/2.0'
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 17 Jan 2017 18:03:59 +0000 (13:03 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 17 Jan 2017 18:03:59 +0000 (13:03 -0500)
1  2 
bgpd/bgp_mplsvpn.c

Simple merge