From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 29 Oct 2015 22:25:55 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1213^2^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=237ce13f6f7406b2d36fbb46e44be3c4f2f540a6;p=matthieu%2Ffrr.git

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

237ce13f6f7406b2d36fbb46e44be3c4f2f540a6