]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge remote-tracking branch 'origin/int-new' into int-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 17 May 2017 12:50:00 +0000 (14:50 +0200)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 17 May 2017 12:50:00 +0000 (14:50 +0200)

Trivial merge