batman-adv: Start new development cycle
authorSimon Wunderlich <sw@simonwunderlich.de>
Sat, 4 Jan 2014 17:04:24 +0000 (18:04 +0100)
committerAntonio Quartulli <antonio@meshcoding.com>
Sun, 12 Jan 2014 13:41:20 +0000 (14:41 +0100)
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
net/batman-adv/main.h

Simple merge