Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <henning@henning-notebook.fritz.box>
Sun, 16 May 2010 15:03:48 +0000 (17:03 +0200)
committerHenning Rogge <henning@henning-notebook.fritz.box>
Sun, 16 May 2010 15:03:48 +0000 (17:03 +0200)
commit2cfbc388c304ffd4e4cf56615dde3e0774a2cfe0
treec882edc59907f06f8ceb9d34a67769e9ddf37ee1
parent9426b6a1ba4d4d6825ea8c44f5a59a6220d3a8d5
parent41fd162cdc555e319fdcc84251b723ceb0ed51bc
Merge branch 'master' of git://olsr.org/olsrd