]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d987f23 7b6a4c4)
Merge branch 'fixes/chris-for-stable-2.0' into stable/2.0
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 14:04:16 +0000 (15:04 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 14:04:16 +0000 (15:04 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

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