Ondrej Zajicek 1c91df9480 Merge commit '8df02847e8af29863c325b7297e3a2b2ed5f961c' into integrated ... Conflicts: proto/ospf/config.Y proto/ospf/hello.c proto/ospf/iface.c proto/ospf/ospf.h		2013-05-23 00:16:19 +02:00
..
bgp	Merge commit '8bd9b930c320f09d3b3792b5f991cf702e9d55be' into integrated	2013-05-23 00:00:26 +02:00
ospf	Merge commit '8df02847e8af29863c325b7297e3a2b2ed5f961c' into integrated	2013-05-23 00:16:19 +02:00
pipe	Separate import and receive limits.	2013-01-10 13:07:33 +01:00
radv	Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated	2013-05-22 15:46:29 +02:00
rip	Merge commit 'a9fc659b840e13323aa43e92eb8f39ceb19b5ed6' into integrated	2013-05-22 15:56:00 +02:00
static	Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated	2013-05-22 15:46:29 +02:00
Doc	Implements Router Advertisement protocol.	2011-03-13 11:33:50 +01:00