]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99a654b 87bb735)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authordslice <dslice@cumulusnetworks.com>
Thu, 18 Feb 2016 16:19:57 +0000 (08:19 -0800)
committerdslice <dslice@cumulusnetworks.com>
Thu, 18 Feb 2016 16:19:57 +0000 (08:19 -0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.