From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Tue, 28 Mar 2017 15:35:57 +0000 (+0200)
Subject: Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new
X-Git-Tag: v2.0.0-pre1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dbeb87ec96157ca95c84d881e014614dd3164a3;p=thirdparty%2Fbird.git

Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new
---

5dbeb87ec96157ca95c84d881e014614dd3164a3