From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 1 Apr 2016 19:28:21 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~996^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c147b93c4096cfc4437bd2f895c2ad8394b7592b;p=mirror%2Ffrr.git

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

c147b93c4096cfc4437bd2f895c2ad8394b7592b