]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b81bc8 9b155c8)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDon Slice <dslice@cumulusnetworks.com>
Tue, 23 Feb 2016 20:30:48 +0000 (20:30 +0000)
committerDon Slice <dslice@cumulusnetworks.com>
Tue, 23 Feb 2016 20:30:48 +0000 (20:30 +0000)

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