From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 20 May 2016 00:06:11 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~465^2~28
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=35b80046b4e1ab0462da32810d2b79734beb1938;p=matthieu%2Ffrr.git

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

35b80046b4e1ab0462da32810d2b79734beb1938