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)
commit398b39a0f6a95dc1616a5aa5f9131907d98eaa4b
treeb056f1bbc8343da1c47e43be5675873c9bcfa45c
parente1a534b28ef1de404ca23b1f9b1fa8230c84d20d
parent4acec04d3b8eb04cd027da87e386364c59534b7d
Merge branch 'http-server'
lib/txtinfo/src/olsrd_txtinfo.c
src/olsr_comport_txt.c