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

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

48abfbeb3bb26cedcca03688d7539faa0175e324