From: vivek <vivek@cumulusnetworks.com>
Date: Thu, 9 Jun 2016 00:58:55 +0000 (-0700)
Subject: Merge branch 'cmaster-next' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into... 
X-Git-Tag: frr-2.0-rc1~554
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b828b71f06e74f4ae2f0956c1d8dbb60ac5f2583;p=mirror%2Ffrr.git

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

b828b71f06e74f4ae2f0956c1d8dbb60ac5f2583