]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge remote-tracking branch 'savannah/sf/ospfd'
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 11 Jan 2013 20:46:18 +0000 (21:46 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 11 Jan 2013 20:46:22 +0000 (21:46 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Trivial merge