From: vivek <vivek@cumulusnetworks.com>
Date: Mon, 22 Feb 2016 05:38:55 +0000 (+0000)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1110^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ceebe0c4e04f618ea790fe0d31de00b2fb6e136f;p=mirror%2Ffrr.git

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

ceebe0c4e04f618ea790fe0d31de00b2fb6e136f