From: Donald Sharp Date: Sat, 24 Oct 2015 00:42:42 +0000 (-0700) Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster X-Git-Tag: frr-2.0-rc1~1215 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=71fcc45bb220a09f35c5b951aaefc98bd8412006;p=matthieu%2Ffrr.git Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster --- 71fcc45bb220a09f35c5b951aaefc98bd8412006