]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'fad04c750ca6906fb095f1b45958dec0ac8e210c' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 30 Jul 2013 20:00:26 +0000 (22:00 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 30 Jul 2013 20:00:26 +0000 (22:00 +0200)
1  2 
nest/rt-table.c

diff --cc nest/rt-table.c
Simple merge