From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 10 Nov 2015 01:04:20 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1204
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=30e129bd4083ff9fe743c1be8cc45da6d6232025;p=mirror%2Ffrr.git

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

30e129bd4083ff9fe743c1be8cc45da6d6232025