From: sharpd <sharpd@cumulusnetworks.com>
Date: Tue, 23 Feb 2016 17:02:24 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1108
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=02ba10e59572dc4c5e16f3c5b4f7a7bd4c8b65c0;p=mirror%2Ffrr.git

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

02ba10e59572dc4c5e16f3c5b4f7a7bd4c8b65c0