Ondrej Zajicek 121fd43d91 Merge commit '145368f5474436ad7c48fa26f5bde8108ae5ef4a' into integrated ... Conflicts: proto/ospf/rt.c		2014-05-02 20:14:43 +02:00
..
bfd	Fixes missing line in BFD context help.	2014-04-02 20:09:37 +02:00
bgp	Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated	2014-05-02 18:28:33 +02:00
ospf	Merge commit '145368f5474436ad7c48fa26f5bde8108ae5ef4a' into integrated	2014-05-02 20:14:43 +02:00
pipe	Merge branch 'master' into add-path	2013-11-23 11:50:34 +01:00
radv	Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated	2014-05-02 18:27:40 +02:00
rip	Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated	2014-05-02 18:27:40 +02:00
static	Merge commit 'd40c26594c22ad934a13061e11b373bdf81af8f9' into integrated	2014-05-02 18:13:20 +02:00
Doc	Initial BFD commit, work in progress.	2013-09-10 12:09:36 +02:00