]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4db5d90 7c5d2b7)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 17 Nov 2015 21:33:17 +0000 (13:33 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 17 Nov 2015 21:33:17 +0000 (13:33 -0800)

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