]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b212c9d 400b1fa)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 29 Oct 2015 22:25:55 +0000 (15:25 -0700)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 29 Oct 2015 22:25:55 +0000 (15:25 -0700)

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