Merge branch 'stable' of http://olsr.org/git/olsrd into stable
authorMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Wed, 16 Dec 2009 23:07:19 +0000 (00:07 +0100)
committerMarkus Kittenberger <Markus.Kittenberger@gmx.at>
Wed, 16 Dec 2009 23:07:19 +0000 (00:07 +0100)
commit43109af3622ae512978ca225bf6454193c6b1a0e
treec7cc9d82447ca2323fb2070c6a69e5427bad0de4
parentac76ef2a04d5ab27f3ae1383b3f21186c9571732
parent9321c95b4954afc093746cb784ee3e27dee25431
Merge branch 'stable' of olsr.org/git/olsrd into stable