From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 1 Sep 2015 19:47:04 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1271
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=83affd0afa8ccefb4c23accfda56909edc185659;p=matthieu%2Ffrr.git

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

83affd0afa8ccefb4c23accfda56909edc185659