From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 2 May 2016 12:24:33 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~950
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e21674bd8881a4302979693f2cc0e364c472eec8;p=matthieu%2Ffrr.git

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

e21674bd8881a4302979693f2cc0e364c472eec8