From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 17 Jan 2017 18:03:59 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~86
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d306e8c3c0a4bfd1d97d485a43614c3ddaf90937;p=matthieu%2Ffrr.git

Merge remote-tracking branch 'origin/stable/2.0'
---

d306e8c3c0a4bfd1d97d485a43614c3ddaf90937