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

On branch : master

commit 8c77610f60b6071849d7a3555989e47fdf5da71d Merge: 4b1dc4a 64fc7ed Author: Marek Lindner lindner_marek@yahoo.de Date: Sun May 12 14:48:29 2013 +0800

Merge branch 'next'

8c77610f60b6071849d7a3555989e47fdf5da71d bridge_loop_avoidance.c | 2 +- main.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)