]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 856ca17 af4b20d)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorMorgan Stewart <morgan@cumulusnetworks.com>
Wed, 19 Aug 2015 16:51:18 +0000 (09:51 -0700)
committerMorgan Stewart <morgan@cumulusnetworks.com>
Wed, 19 Aug 2015 16:51:18 +0000 (09:51 -0700)

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