Merge pull request #332 from ecsv/batadv-2017.4
authorMoritz Warning <moritzwarning@web.de>
Wed, 13 Dec 2017 20:42:52 +0000 (21:42 +0100)
committerGitHub <noreply@github.com>
Wed, 13 Dec 2017 20:42:52 +0000 (21:42 +0100)
batman-adv 2017.4


Trivial merge