]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ecc09d 96885f1)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 25 Jan 2016 19:39:10 +0000 (11:39 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 25 Jan 2016 19:39:10 +0000 (11:39 -0800)

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