]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dfe1c3 a957a05)
Merge branch 'frr/pull/118'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 Jan 2017 02:15:33 +0000 (03:15 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 Jan 2017 02:15:33 +0000 (03:15 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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