From: vivek <vivek@cumulusnetworks.com>
Date: Wed, 13 Apr 2016 18:08:57 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~967^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9e9ca964ece098a01f594e259565ed442ae8aeda;p=matthieu%2Ffrr.git

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

9e9ca964ece098a01f594e259565ed442ae8aeda