Merge pull request #367 from ecsv/batadv-2018.1
authorMoritz Warning <moritzwarning@web.de>
Wed, 2 May 2018 14:50:57 +0000 (16:50 +0200)
committerGitHub <noreply@github.com>
Wed, 2 May 2018 14:50:57 +0000 (16:50 +0200)
batman-adv 2018.1


Trivial merge