From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 20 Oct 2015 21:51:31 +0000 (+0000)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1232^2~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=db07cdc49847e2f99d27d0e6ba0f199fba0ddf44;p=matthieu%2Ffrr.git

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

db07cdc49847e2f99d27d0e6ba0f199fba0ddf44