Merge pull request #270 from ecsv/batadv-17.01
authorSimon Wunderlich <sw@simonwunderlich.de>
Fri, 3 Feb 2017 18:06:09 +0000 (19:06 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2017 18:06:09 +0000 (19:06 +0100)
commitdd36dd47bbd75defcb3c517cafe7a19ee425f0af
tree1057c8b9d03a71a17fc7541101df81092d861ade
parenta6c7413594a0e4b42dab42bb5fa68534e39b7d0c
parentb71f8bfccb85df1f13be14bb41e97675536923cd
Merge pull request #270 from ecsv/batadv-17.01

LEDE-17.01: batman-adv: maint patch import + settings fixes