From: vivek <vivek@cumulusnetworks.com>
Date: Wed, 21 Oct 2015 05:41:30 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1223
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fcb2988fd8c5bfa244466244872f9d5aa40fbe57;p=matthieu%2Ffrr.git

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

fcb2988fd8c5bfa244466244872f9d5aa40fbe57