From: Morgan Stewart <morgan@cumulusnetworks.com>
Date: Wed, 19 Aug 2015 16:51:18 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1281
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ca3faf4e08e10c841e826db649f41631c1f65fef;p=mirror%2Ffrr.git

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

ca3faf4e08e10c841e826db649f41631c1f65fef