]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11f3bfd 0e236c6)
Merge branch 'stable/3.0'
authorDavid Lamparter <equinox@diac24.net>
Wed, 9 Aug 2017 12:35:17 +0000 (14:35 +0200)
committerDavid Lamparter <equinox@diac24.net>
Wed, 9 Aug 2017 12:35:17 +0000 (14:35 +0200)
... with a lot of fixups.

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

Trivial merge
FRRouting mirror