Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 923d65144c55cdb099aaa826140ad9e0df2dab04 Merge: 98d7a76 f4eea21 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jun 6 23:25:49 2016 +0800

Merge branch 'next'

923d65144c55cdb099aaa826140ad9e0df2dab04 net/batman-adv/translation-table.c | 37 +++++++++++++++++++++++++++++++++---- net/batman-adv/types.h | 2 ++ 2 files changed, 35 insertions(+), 4 deletions(-)