Merge branch 'stable' into dual_socket
authorHenning Rogge <hrogge@googlemail.com>
Sat, 19 Dec 2009 21:27:52 +0000 (22:27 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sat, 19 Dec 2009 21:27:52 +0000 (22:27 +0100)
commit6e8a51eb3e6f737244e9591d317a84c99badfc27
treef87df060cdad3a67e788a060c270bfb06ad673fd
parenta4245fabdb01fa25dd48ec97daf2cf5584f9006e
parentc2425c17e115e65e1f5e0a0d864f6302eda2a5e9
Merge branch 'stable' into dual_socket
lib/txtinfo/src/olsrd_txtinfo.c
src/bsd/net.c
src/linux/net.c
src/main.c