]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 10 Nov 2015 01:04:20 +0000 (17:04 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 10 Nov 2015 01:04:20 +0000 (17:04 -0800)

Trivial merge