From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 28 Nov 2016 18:26:28 +0000 (+0100)
Subject: Merge branch 'stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~141
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=236dbdac0674f45540f6dc71910683af0a3fd51c;p=mirror%2Ffrr.git

Merge branch 'stable/2.0'
---

236dbdac0674f45540f6dc71910683af0a3fd51c