From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 25 Mar 2016 17:07:40 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1038
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8fe43e65fb810eda705ef53fa41f86375b9687cd;p=mirror%2Ffrr.git

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

8fe43e65fb810eda705ef53fa41f86375b9687cd