From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 7 Oct 2015 16:32:41 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1241
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8ee2b0836933feb7c74694982547ed7fb66870d7;p=mirror%2Ffrr.git

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

8ee2b0836933feb7c74694982547ed7fb66870d7