From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 18 May 2017 12:28:03 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a9169e152779ac6f99e2eccb79a2a2f6e2c76b2;p=thirdparty%2Fbird.git

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

5a9169e152779ac6f99e2eccb79a2a2f6e2c76b2