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

On branch : master

commit da134af671c9d51a3d248a78a8ecec5f237dc25f Merge: 548c938 637eb9c Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Feb 11 20:09:19 2014 +0800

Merge branch 'next'

da134af671c9d51a3d248a78a8ecec5f237dc25f bat_iv_ogm.c | 2 ++ distributed-arp-table.c | 5 +++++ 2 files changed, 7 insertions(+)