]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 31 Jul 2013 15:39:16 +0000 (17:39 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 31 Jul 2013 15:39:16 +0000 (17:39 +0200)
commit6477b8f10cc8626edc125f3a9e7f298303a22a48
tree95ec4ce01208d7ec04f5be0c3aaf48897888f6b3
parent6abc22f4b0cc0b1bd226d04ab3a4f8f59cd1f8d6
parentc6964c305b425b98aaf0492806a28b578d799d83
Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated

Conflicts:

sysdep/bsd/krt-sock.c
sysdep/linux/netlink.c
sysdep/unix/krt.h
sysdep/bsd/krt-sock.c
sysdep/bsd/krt-sys.h
sysdep/linux/netlink.c
sysdep/unix/krt.c
sysdep/unix/krt.h