From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 20 Nov 2015 19:10:29 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1188
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f1121188c7c767d0ad45c02c852a984994f13223;p=mirror%2Ffrr.git

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

f1121188c7c767d0ad45c02c852a984994f13223