]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86894a2 be08f67)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorsharpd <sharpd@cumulusnetworks.com>
Tue, 16 Feb 2016 13:17:54 +0000 (05:17 -0800)
committersharpd <sharpd@cumulusnetworks.com>
Tue, 16 Feb 2016 13:17:54 +0000 (05:17 -0800)

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