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

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

04c4401239ac9baaae7d2bdb269c651c20aaca5e