From: David Lamparter <equinox@diac24.net>
Date: Wed, 9 Aug 2017 12:35:17 +0000 (+0200)
Subject: Merge branch 'stable/3.0'
X-Git-Tag: frr-4.0-dev~439
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9cdce038c51d259e4416c3e2f15d70e76c5e176f;p=mirror%2Ffrr.git

Merge branch 'stable/3.0'

... with a lot of fixups.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

9cdce038c51d259e4416c3e2f15d70e76c5e176f