From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 17 May 2017 15:37:27 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b701e69cc812260788eced3370c7e65cd0e25fe;p=thirdparty%2Fbird.git

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

9b701e69cc812260788eced3370c7e65cd0e25fe