]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge branch 'soon'
authorOndrej Zajicek <santiago@crfreenet.org>
Fri, 30 Mar 2012 09:04:12 +0000 (11:04 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Fri, 30 Mar 2012 09:04:12 +0000 (11:04 +0200)
commitbf2abe2f515d7b7aaed5fb4f37af82169adcd2f2
tree158a3edcfa3a79a954cb5a26989929120ec8912b
parentfb829de69052755a31d76d73e17525d050e5ff4d
parentc0adf7e9fc0bb920175a639c6f56ed7b4190f3e4
Merge branch 'soon'

Conflicts:

nest/proto.c
nest/rt-table.c
nest/proto.c
nest/protocol.h
nest/route.h
nest/rt-table.c
sysdep/unix/krt.c