]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12179ba 141973c)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 20 Oct 2015 21:51:31 +0000 (21:51 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 20 Oct 2015 21:51:31 +0000 (21:51 +0000)

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