]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorVipin Kumar <vipin@cumulusnetworks.com>
Tue, 20 Oct 2015 22:14:06 +0000 (15:14 -0700)
committerVipin Kumar <vipin@cumulusnetworks.com>
Tue, 20 Oct 2015 22:14:06 +0000 (15:14 -0700)

Trivial merge