From: vivek <vivek@cumulusnetworks.com>
Date: Wed, 24 Feb 2016 04:10:07 +0000 (+0000)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1103^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=23afb7ada011589e67576dfaa747512d961e9b03;p=mirror%2Ffrr.git

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

23afb7ada011589e67576dfaa747512d961e9b03