From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 9 Dec 2015 12:26:55 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1169
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=451e7cd49e081de307b682dc24b0ed850e22edfb;p=mirror%2Ffrr.git

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

451e7cd49e081de307b682dc24b0ed850e22edfb