From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Feb 2016 20:06:58 +0000 (-0500)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1101
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=51b9c0cc9edf6eacd0ef2aa38e13d5a1d54b3f95;p=mirror%2Ffrr.git

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

51b9c0cc9edf6eacd0ef2aa38e13d5a1d54b3f95