]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17f784d 05ea5ce)
Merge branch 'frr/pull/205' ("Pim stuff")
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 17 Feb 2017 17:06:54 +0000 (18:06 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 17 Feb 2017 17:06:54 +0000 (18:06 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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