From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 2 Jan 2018 15:59:59 +0000 (+0100)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bd8cb7c3ca23524cb7d69ee503e24658ad2ee42;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

9bd8cb7c3ca23524cb7d69ee503e24658ad2ee42