From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 27 Nov 2015 16:58:52 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1182
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cbdee2350a4a12d96a35d7fa937900b9063e11ec;p=mirror%2Ffrr.git

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

cbdee2350a4a12d96a35d7fa937900b9063e11ec