batman-adv: Start new development cycle
authorSven Eckelmann <sven@narfation.org>
Mon, 29 Oct 2012 16:15:08 +0000 (17:15 +0100)
committerAntonio Quartulli <ordex@autistici.org>
Wed, 21 Nov 2012 11:35:46 +0000 (12:35 +0100)
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
net/batman-adv/main.h

Simple merge