From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 30 Mar 2016 12:15:21 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1003
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0974ce9a0d7401829000acae071422888cbd572b;p=mirror%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

0974ce9a0d7401829000acae071422888cbd572b