]> git.proxmox.com Git - mirror_frr.git/commit
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)
commitb2e5bdbe10c4145f508fcf1486ffe29d5ce516f7
treefae70e8c1580d99fee0c2a59d6bef831c4c9465c
parenta16dcf7c11d80775b07a0fa6f3ac5527190fb486
parente0630cb4d61557f956318a088f68f1fc4d261ef3
Merge remote-tracking branch 'savannah/sf/ospfd'

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