Ondrej Zajicek 44f9cca21d Merge commit 'a5fc59587fe864e4fcfb44eb3be57231b4ca339b' into integrated ... Conflicts: filter/filter.c nest/config.Y		2014-04-29 15:15:35 +02:00
..
bfd	BFD work in progress.	2013-09-16 23:57:40 +02:00
bgp	Merge commit 'b21955e05800c3ceedfe39eef605da84285296c7' into integrated	2014-04-29 12:41:18 +02:00
ospf	Merge commit 'a5fc59587fe864e4fcfb44eb3be57231b4ca339b' into integrated	2014-04-29 15:15:35 +02:00
pipe	Separate import and receive limits.	2013-01-10 13:07:33 +01:00
radv	Merge commit 'a0b176e3b2b50d3a30574afa927e0ee8ef65be68' into integrated	2013-07-31 18:36:26 +02:00
rip	Merge commit '6a8d3f1c1ffbd964e4d11b452c73e1ea70310af3' into integrated	2014-04-29 13:00:14 +02:00
static	Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated	2013-05-22 15:46:29 +02:00
Doc	Initial BFD commit, work in progress.	2013-09-10 12:09:36 +02:00