Merge pull request #1 from openwrt-routing/master

merge upstream
fix for iynvalid jsoninfo output
a much simpler and cleaner fix
Merge pull request #6 from mmunz/master

Fix a regression in the jsoninfo plugin which was introduced in olsrd 0.6.6