From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 20 Nov 2015 15:12:30 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1191^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8afc891ac75f2b1f17d9190ef8de5378ec55fcd5;p=matthieu%2Ffrr.git

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

8afc891ac75f2b1f17d9190ef8de5378ec55fcd5