From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 24 Oct 2015 00:14:01 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1215^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a93c2f63ee5f563c6d2d6dadeba8f78ad031571b;p=matthieu%2Ffrr.git

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

a93c2f63ee5f563c6d2d6dadeba8f78ad031571b