]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'nexthop-merged' into int-new
authorJan Moskyto Matejka <mq@ucw.cz>
Wed, 22 Mar 2017 13:54:00 +0000 (14:54 +0100)
committerJan Moskyto Matejka <mq@ucw.cz>
Wed, 22 Mar 2017 13:54:00 +0000 (14:54 +0100)
1  2 
doc/bird.sgml

diff --cc doc/bird.sgml
Simple merge