batman-adv: Start new development cycle
authorSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Sat, 20 Apr 2013 15:15:09 +0000 (17:15 +0200)
committerAntonio Quartulli <ordex@autistici.org>
Wed, 29 May 2013 00:44:56 +0000 (02:44 +0200)
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
net/batman-adv/main.h

Simple merge