Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit 2e962f1055dcb52441ee2dfea042cac75b785803 Merge: fe3e32e 9ed1b2e Author: Marek Lindner lindner_marek@yahoo.de Date: Fri Nov 30 17:41:28 2012 +0800

Merge branch 'next'

2e962f1055dcb52441ee2dfea042cac75b785803 packet.h | 2 -- tcpdump.c | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-)