]> 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>
Wed, 3 Feb 2016 14:01:59 +0000 (09:01 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 3 Feb 2016 14:01:59 +0000 (09:01 -0500)

Trivial merge