From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Mar 2016 00:03:27 +0000 (-0500)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1070
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a4c52804ac934bd43e6ed4957fa0b8dbc61d6f89;p=mirror%2Ffrr.git

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

a4c52804ac934bd43e6ed4957fa0b8dbc61d6f89