From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 1 Dec 2016 16:24:03 +0000 (+0100)
Subject: Merge branch 'stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~135
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0577b824e137f143c899a567b1bbeb109841c796;p=matthieu%2Ffrr.git

Merge branch 'stable/2.0'
---

0577b824e137f143c899a567b1bbeb109841c796