batman-adv: Start new development cycle
authorSimon Wunderlich <sw@simonwunderlich.de>
Fri, 16 May 2014 11:30:45 +0000 (13:30 +0200)
committerAntonio Quartulli <antonio@meshcoding.com>
Sun, 18 May 2014 13:04:00 +0000 (15:04 +0200)
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
net/batman-adv/main.h

Simple merge