]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6678277 c147b93)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDon Slice <dslice@cumulusnetworks.com>
Fri, 1 Apr 2016 23:16:20 +0000 (16:16 -0700)
committerDon Slice <dslice@cumulusnetworks.com>
Fri, 1 Apr 2016 23:16:20 +0000 (16:16 -0700)

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