From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Wed, 22 Feb 2017 10:58:04 +0000 (+0100)
Subject: Merge branch 'int-new' into nexthop-merged
X-Git-Tag: v2.0.0-pre1~29^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c609d039860f97f400d2cf0e9ca2b4e87b3fd1cc;p=thirdparty%2Fbird.git

Merge branch 'int-new' into nexthop-merged
---

c609d039860f97f400d2cf0e9ca2b4e87b3fd1cc