Merge pull request #870 from chiragshah6/mdev

author David Lamparter <equinox@diac24.net>

Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)

committer GitHub <noreply@github.com>

Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)
author David Lamparter <equinox@diac24.net>
Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)
committer GitHub <noreply@github.com>
Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)
diff --cc ospf6d/ospf6_lsa.c
Simple merge
diff --cc ospf6d/ospf6_route.c
Simple merge
diff --cc ospfd/ospfd.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)
committer	GitHub <noreply@github.com>
	Fri, 4 Aug 2017 06:46:38 +0000 (08:46 +0200)
		1	2
ospf6d/ospf6_lsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	patch \|	diff1 \|	diff2 \|	blob \| history