From: dslice <dslice@cumulusnetworks.com>
Date: Thu, 18 Feb 2016 16:19:57 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1122
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=048cb054189c7d9872ce60c85d8915426aeb7d2e;p=mirror%2Ffrr.git

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

048cb054189c7d9872ce60c85d8915426aeb7d2e