Merge branch 'stable' of git://olsr.org/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Fri, 22 Jan 2010 16:30:49 +0000 (17:30 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Fri, 22 Jan 2010 16:30:49 +0000 (17:30 +0100)
commitac9afb0144f9d960b1cc25a8866738d3ba2b9eb2
treefa61195bfc1f5d565c25a41caf6cce54e8dc15b1
parentdb7746a26f05d937d4f7859e0eb837b4afa2621b
parent200b3713e044c0fa5a76d82a3b7daf5c603d9542
Merge branch 'stable' of git://olsr.org/olsrd into stable