[commits] [batman-adv] master: Merge branch 'next' (82febf6)

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

On branch : master

commit 82febf64a28c2a845c73930744877638c5ef71f4 Merge: 86469da 7ace0eb Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu May 15 04:46:33 2014 +0800

Merge branch 'next'

82febf64a28c2a845c73930744877638c5ef71f4 soft-interface.c | 60 +++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 ++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 74 insertions(+), 14 deletions(-)