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

On branch : next

commit a1b142620c8dad5e75fbb615925fb76846b5d45d Merge: 7ace0eb 236e603 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu May 15 05:16:19 2014 +0800

Merge branch 'maint' into next

a1b142620c8dad5e75fbb615925fb76846b5d45d originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)