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

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

f47603b04df073bff8fc1b90d6de0ee5420abcec