]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fe5171 d4986a1)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDon Slice <dslice@cumulusnetworks.com>
Fri, 22 Apr 2016 12:40:09 +0000 (05:40 -0700)
committerDon Slice <dslice@cumulusnetworks.com>
Fri, 22 Apr 2016 12:40:09 +0000 (05:40 -0700)

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