Merge pull request #296 from ecsv/batadv-2017.1
authorSimon Wunderlich <sw@simonwunderlich.de>
Mon, 29 May 2017 07:29:00 +0000 (09:29 +0200)
committerGitHub <noreply@github.com>
Mon, 29 May 2017 07:29:00 +0000 (09:29 +0200)
batman-adv 2017.1


Trivial merge