]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge branch 'restricted-mode'
authorPaul Jakma <paul.jakma@sun.com>
Thu, 4 Sep 2008 12:52:38 +0000 (13:52 +0100)
committerPaul Jakma <paul@quagga.net>
Thu, 4 Sep 2008 12:52:38 +0000 (13:52 +0100)
1  2 
bgpd/bgp_vty.c

diff --cc bgpd/bgp_vty.c
Simple merge