]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit '8df02847e8af29863c325b7297e3a2b2ed5f961c' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 22:16:19 +0000 (00:16 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 22:16:19 +0000 (00:16 +0200)
commit1c91df94801365691d7636b5bc08822d0048f51d
tree2a548afd5644325f6c5ab5e9d99504fd41d771d9
parent6679f15ef3a89a6fb502d89d171981df55da085d
parent8df02847e8af29863c325b7297e3a2b2ed5f961c
Merge commit '8df02847e8af29863c325b7297e3a2b2ed5f961c' into integrated

Conflicts:

proto/ospf/config.Y
proto/ospf/hello.c
proto/ospf/iface.c
proto/ospf/ospf.h
proto/ospf/config.Y
proto/ospf/hello.c
proto/ospf/iface.c
proto/ospf/ospf.h