tree fae70e8c1580d99fee0c2a59d6bef831c4c9465c
parent a16dcf7c11d80775b07a0fa6f3ac5527190fb486
parent e0630cb4d61557f956318a088f68f1fc4d261ef3
author David Lamparter <equinox@opensourcerouting.org> 1357937178 +0100
committer David Lamparter <equinox@opensourcerouting.org> 1357937182 +0100

Merge remote-tracking branch 'savannah/sf/ospfd'

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