[commits] [batctl] master: Merge branch 'maint' (e24c95f)

Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit e24c95fd27f45721f00aad9672a55c8d4af573c2 Merge: 07d3739 8c5a028 Author: Sven Eckelmann sven@narfation.org Date: Mon Dec 24 21:49:44 2018 +0100

Merge branch 'maint'

e24c95fd27f45721f00aad9672a55c8d4af573c2 bridge_loop_avoidance.c | 2 +- debug.c | 4 ++-- debug.h | 2 +- distributed_arp_table.c | 2 +- functions.c | 42 +++++------------------------------------- loglevel.c | 2 ++ multicast_mode.c | 2 +- network_coding.c | 2 +- originators.c | 2 +- sys.h | 6 ------ 10 files changed, 15 insertions(+), 51 deletions(-)