Merge branch 'rfc4760' into fdn-mods
authorBenjamin Cama <benoar@dolka.fr>
Fri, 29 Jul 2011 11:04:31 +0000 (13:04 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Fri, 29 Jul 2011 11:04:31 +0000 (13:04 +0200)
commit1c898f7017d2f3bfc07dfdadd077d70ccf6066c1
treef9a57b3d2419dac6ebf2a74bbea099af2d514f60
parent8c4f3bfe794e4ff92662d9be5903e5b203f5d41e
parent21ae6221cf930ed4aa9bb6a4f9cafab2cdc5fe76
Merge branch 'rfc4760' into fdn-mods
bgp.c
bgp.h
etc/startup-config.default
l2tpns.c
l2tpns.h