]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c9a4d2 6ac011a)
Merge branch 'frr/pull/964' into stable/3.0
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 16 Aug 2017 13:20:14 +0000 (15:20 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 16 Aug 2017 13:20:14 +0000 (15:20 +0200)
This accidentally ended up merged to master... *derp*

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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