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

On branch : master

commit d1af3f2196fa598b0a71211a7dc7e071d6a20c0b Merge: 869a0e5 9d48399 Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed May 14 19:49:15 2014 +0800

Merge branch 'next'

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