]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f46f475 33a57d9)
Merge branch 'frr/pull/672' into stable/3.0
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 6 Jun 2017 14:47:48 +0000 (16:47 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 6 Jun 2017 14:47:48 +0000 (16:47 +0200)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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