]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDon Slice <dslice@cumulusnetworks.com>
Wed, 10 Feb 2016 21:01:53 +0000 (13:01 -0800)
committerDon Slice <dslice@cumulusnetworks.com>
Wed, 10 Feb 2016 21:01:53 +0000 (13:01 -0800)

Trivial merge