[commits] [batman-adv] master: Merge remote-tracking branch 'origin/next' (5c3abe0)

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

On branch : master

commit 5c3abe0701db7bf23acc817feb6d7c8be3055cd7 Merge: 60087ff d964188 Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Oct 14 18:04:17 2013 +0200

Merge remote-tracking branch 'origin/next'

5c3abe0701db7bf23acc817feb6d7c8be3055cd7 CHANGELOG | 11 +++++++++++ README.external | 2 +- hard-interface.c | 33 ++++---------------------------- hard-interface.h | 2 +- main.h | 2 +- packet.h | 5 +++-- translation-table.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++-- types.h | 12 ++++++++++++ 8 files changed, 83 insertions(+), 36 deletions(-)