Merge pull request #242 from freifunk-leipzig/master
authorBastian Bittorf <bb@npl.de>
Fri, 16 Dec 2016 14:59:29 +0000 (15:59 +0100)
committerGitHub <noreply@github.com>
Fri, 16 Dec 2016 14:59:29 +0000 (15:59 +0100)
olsrd: new version number 0.9.5 and new netjson plugin
(for now it needs manually selected the libgps-dependency, which gets fixed in the next commit)


Trivial merge