]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 300dfa7 a27cb3c)
Merge branch 'frr/pull/574'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:39:58 +0000 (11:39 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:39:58 +0000 (11:39 +0200)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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