Merge branch 'http-server'
authorHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 19:48:07 +0000 (20:48 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 19:48:07 +0000 (20:48 +0100)
1  2 
lib/txtinfo/src/olsrd_txtinfo.c
src/olsr_comport_txt.c

Simple merge
Simple merge