]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d20ccf beef199)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorvivek <vivek@cumulusnetworks.com>
Fri, 13 May 2016 17:18:37 +0000 (10:18 -0700)
committervivek <vivek@cumulusnetworks.com>
Fri, 13 May 2016 17:18:37 +0000 (10:18 -0700)

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