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

On branch : master

commit e481da04e18dc69c1131ea9a6e659f4e01eb7d65 Merge: 4f47cce 6e16a7d Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Aug 26 17:21:05 2016 +0800

Merge branch 'next'

e481da04e18dc69c1131ea9a6e659f4e01eb7d65 net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/routing.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-)