Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Sun, 5 Sep 2010 19:47:32 +0000 (21:47 +0200)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Sun, 5 Sep 2010 19:47:32 +0000 (21:47 +0200)
commit089033625406147bd042077b6b398c76133ebb14
tree56d5ff5374a6fa67fa8350f1e36d5b89e09e7729
parent5ed0d7159b1bb66d551bf383abac91b2c91e681c
parent70ae1328c03f928c61a2fea95d499735649f1a25
Merge branch 'stable' of git://olsr.org/olsrd into stable