]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'int-new-channels' of gitlab.labs.nic.cz:labs/bird into int-new-channels
authorJan Moskyto Matejka <mq@ucw.cz>
Thu, 7 Apr 2016 07:58:31 +0000 (09:58 +0200)
committerJan Moskyto Matejka <mq@ucw.cz>
Thu, 7 Apr 2016 07:58:31 +0000 (09:58 +0200)

Trivial merge