From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 19 May 2017 13:41:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~131
X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=78ca62a7b221defb21e4ab724de72b3634132996

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

78ca62a7b221defb21e4ab724de72b3634132996