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

On branch : master

commit 8eb830fa19d3c61ec2d305c68b2724b865611167 Merge: 7540bb8 77c2a6c Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Jan 5 19:19:35 2014 +0800

Merge branch 'next'

Conflicts: originator.c translation-table.c

8eb830fa19d3c61ec2d305c68b2724b865611167 originator.c | 2 +- translation-table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)