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)
1  2 
lib/jsoninfo/src/olsrd_jsoninfo.c
lib/txtinfo/src/olsrd_txtinfo.c

Simple merge
Simple merge