]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6b66ab 3d63d59)
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 9 Dec 2015 12:26:55 +0000 (04:26 -0800)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 9 Dec 2015 12:26:55 +0000 (04:26 -0800)

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