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

On branch : next

commit 3269ba99e75101104bddc3200fec33a3c1011748 Merge: 4e564b0 d6bd8b3 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu May 9 17:01:39 2013 +0800

Merge branch 'maint' into next

3269ba99e75101104bddc3200fec33a3c1011748 distributed-arp-table.c | 13 +++++++++++++ network-coding.c | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)