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

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

33e450331eb2060dc315915e13949ad2f0960114