From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 10 Jun 2016 01:20:55 +0000 (-0700)
Subject: Merge branch 'cmaster-next' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into... 
X-Git-Tag: frr-2.0-rc1~550
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eaafc874d089560e85b8e9bdc1f896b015f877ad;p=matthieu%2Ffrr.git

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

eaafc874d089560e85b8e9bdc1f896b015f877ad