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

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

141973cbd8807908e742029aa297bf9950a2bcf8