Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 Jun 2010 06:21:16 +0000 (08:21 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 14 Jun 2010 06:21:16 +0000 (08:21 +0200)
commit35caa5be2f45ea81006dd15a08499ad05fbbba22
tree9cbc1c8a400919daa139c6ed7e1e640fb8711f3d
parent743aba9cedeb817135d361db05e1f49ce752a803
parentb9ffbde7346e5e6683c671787434641f426e0a7d
Merge branch 'master' of http://olsr.org/git/olsrd