From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 13 Jan 2016 18:51:07 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1162
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=edc9de4f3800cf3bf7a95da425145f5aa1e1a63a;p=matthieu%2Ffrr.git

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

edc9de4f3800cf3bf7a95da425145f5aa1e1a63a