From: vivek <vivek@cumulusnetworks.com>
Date: Mon, 6 Jun 2016 15:43:54 +0000 (-0700)
Subject: Merge branch 'cmaster-next' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into... 
X-Git-Tag: frr-2.0-rc1~620
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5b05494f8c42d06d6ddaf200f34beabbd91ba524;p=matthieu%2Ffrr.git

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

5b05494f8c42d06d6ddaf200f34beabbd91ba524