]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fb16c6 a9019bd)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 24 Oct 2015 00:42:42 +0000 (17:42 -0700)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 24 Oct 2015 00:42:42 +0000 (17:42 -0700)

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