From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 3 Feb 2016 14:01:59 +0000 (-0500)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1142
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=14a4730101d4681f109a8b1eaef6145b541fc00f;p=mirror%2Ffrr.git

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

14a4730101d4681f109a8b1eaef6145b541fc00f