From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Sep 2015 20:30:13 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1261
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=241f85e471aa090290ee98b6dfcff104941cc042;p=mirror%2Ffrr.git

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

241f85e471aa090290ee98b6dfcff104941cc042