From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 13 May 2016 17:18:37 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~916
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5e1338984210ad29c21d8f0ee3c65c10fb7cb402;p=matthieu%2Ffrr.git

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

5e1338984210ad29c21d8f0ee3c65c10fb7cb402