[commits] [batman-adv] master: Merge branch 'next' (b85918b)

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

On branch : master

commit b85918b46ed49cba9b1a663f713531c6fca92eaf Merge: 7e86840 4c1721b Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Oct 18 01:56:37 2012 +0800

Merge branch 'next'

b85918b46ed49cba9b1a663f713531c6fca92eaf bridge_loop_avoidance.c | 24 +++++++++++++++--------- main.c | 1 + routing.c | 8 +++++++- types.h | 2 ++ 4 files changed, 25 insertions(+), 10 deletions(-)