]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge remote-tracking branch 'origin/int-new' into int-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Thu, 12 May 2016 16:11:12 +0000 (18:11 +0200)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Thu, 12 May 2016 16:11:12 +0000 (18:11 +0200)
1  2 
nest/rt-attr.c

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