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

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

77810030d2556e3af659d354a2b3d661f58dd735