Merge branch 'master' into mpr_rework
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 15 Feb 2017 07:14:56 +0000 (08:14 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 15 Feb 2017 07:14:56 +0000 (08:14 +0100)
commit34169e26029ec1b3c0ce8eff9986ad3c29b08da9
tree2ba435e19224802bd1f08713650b5fecb20f9d62
parentef03533606233c601c3b9c79f4e59a45b1a374eb
parentd10bff073f1657e4ff5fd58b79c1691a138b058a
Merge branch 'master' into mpr_rework
src-plugins/nhdp/nhdp/nhdp_db.c