From: Vipin Kumar Date: Tue, 20 Oct 2015 22:14:06 +0000 (-0700) Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster X-Git-Tag: frr-2.0-rc1~1232 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3607212c76371f3f2a40bca60a1a5831405002ba;p=matthieu%2Ffrr.git Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster --- 3607212c76371f3f2a40bca60a1a5831405002ba