Merge remote-tracking branch 'upstream/master' into bugfixes
Fix parsing of static ndp entries
Merge remote-tracking branch 'upstream/master' into bugfixes
Merge branch 'master' of https://github.com/sbyx/odhcpd into bugfixes
Revert "Fix parsing of static ndp entries"

This reverts commit 81fda48454a23d890a33035c61316b5e64dbb434.
Fix parsing of static ndp list
Merge branch 'bugfixes'