From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 28 Jun 2017 23:10:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/2.0'
X-Git-Tag: reindent-master-before~48
X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=4275d86bbd4a4090e1667522b8387e01a83efa68

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

4275d86bbd4a4090e1667522b8387e01a83efa68