]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new
authorJan Moskyto Matejka <mq@ucw.cz>
Fri, 13 May 2016 11:48:04 +0000 (13:48 +0200)
committerJan Moskyto Matejka <mq@ucw.cz>
Fri, 13 May 2016 11:48:04 +0000 (13:48 +0200)
1  2 
nest/rt-attr.c

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