]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70bd3c4 8b1fb8b)
Merge branch 'cmaster-next' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into...
authorDon Slice <dslice@cumulusnetworks.com>
Mon, 13 Jun 2016 13:17:25 +0000 (09:17 -0400)
committerDon Slice <dslice@cumulusnetworks.com>
Mon, 13 Jun 2016 13:17:25 +0000 (09:17 -0400)

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