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

On branch : master

commit c72c2785cdee4378ab0f4e241e717a224bf00c1e Merge: a468009 a1770e4 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Sep 17 23:25:32 2013 +0000

Merge branch 'next'

Conflicts: soft-interface.c

c72c2785cdee4378ab0f4e241e717a224bf00c1e