]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge volatile/cumulus_ospf6d
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 18 Mar 2014 16:04:25 +0000 (17:04 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 18 Mar 2014 16:04:25 +0000 (17:04 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Trivial merge