Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Sun, 5 Sep 2010 08:08:29 +0000 (10:08 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Sun, 5 Sep 2010 08:08:29 +0000 (10:08 +0200)
commit70ae1328c03f928c61a2fea95d499735649f1a25
tree2fbea4dfcd1a5631ca1eca4d05639b04f4e4d428
parenta064970885eb39cd5b72f260a20ff46482b25dc4
parent7de2efbbe30363126a3a44fa2e83521c43449f44
Merge branch 'stable' of git://193.238.157.30/olsrd into stable