Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@gmail.com>
Sun, 16 Nov 2014 15:07:00 +0000 (16:07 +0100)
committerHenning Rogge <hrogge@gmail.com>
Sun, 16 Nov 2014 15:07:00 +0000 (16:07 +0100)
commita319680380455919337cad7dbde47ad85fca5cf4
tree1d9ef1a4fb2960bace29ff5b3da31af8a7857728
parentb66aff0ef6da145f28c34fe32003f9d3bfaf677c
parent3b3fe2ae0bf2a395d2a2e35dba7c6c83963d6792
Merge branch 'master' of git://olsr.org/olsrd
lib/jsoninfo/src/olsrd_jsoninfo.c
lib/txtinfo/src/olsrd_txtinfo.c