From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 27 Apr 2016 19:55:43 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~952^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e2dd9485cb35cf81add815959927a3016116d898;p=matthieu%2Ffrr.git

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

e2dd9485cb35cf81add815959927a3016116d898