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

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

798c5f61f8d8046dcdd20deecfdee21c16e370fd