]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba434de 59d4564)
Merge branch 'frr/pull/132' ("grabbag")
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 31 Jan 2017 12:03:07 +0000 (13:03 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 31 Jan 2017 12:03:07 +0000 (13:03 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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