Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Fri, 19 Aug 2011 16:29:39 +0000 (18:29 +0200)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Fri, 19 Aug 2011 16:29:39 +0000 (18:29 +0200)
commitf3e03a1ddd16df4580d10e210495be2c03fd8123
tree10fede96cef0fe0c23d764c4488ad0ee36fb242d
parent8d2b515f63f44e0cff538f3a7dd9ec4a91e093c3
parent7d52799409fa48550dc203740eeb9247c9a93294
Merge branch 'stable' of git://olsr.org/olsrd into stable