From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 10 Mar 2016 13:49:47 +0000 (-0500)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1066
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2286f0fb569b751104bfac1cbd1a333055da674d;p=mirror%2Ffrr.git

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

2286f0fb569b751104bfac1cbd1a333055da674d