tree 8f33d73b2a85b51c042318d58a1750eeb8019616
parent a11e012e8661629d665e992e765741a5eaa7d017
parent 424cc3bd48da0f417c9056c5c2ade697a3386cd4
author David Lamparter <equinox@opensourcerouting.org> 1395158665 +0100
committer David Lamparter <equinox@opensourcerouting.org> 1395158665 +0100

Merge volatile/cumulus_ospf6d

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