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

On branch : master

commit 11beafc4cbb0a28d06944503578d9c3d98073dcd Merge: b8ffcbc e08e28f Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat Feb 8 21:23:25 2014 +0800

Merge branch 'next'

11beafc4cbb0a28d06944503578d9c3d98073dcd bat_iv_ogm.c | 22 ++++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 56 insertions(+), 6 deletions(-)