From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 22 Apr 2016 16:34:04 +0000 (-0400)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~955
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=01961e304f254c9bc2db9a290336aedb6316dcaa;p=matthieu%2Ffrr.git

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

01961e304f254c9bc2db9a290336aedb6316dcaa