Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 29 Oct 2010 11:13:09 +0000 (13:13 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Fri, 29 Oct 2010 11:13:09 +0000 (13:13 +0200)
commitbcdd5aea60d12975960a40fb8d8325ed1a380e15
treed21642ef5d959ff12606808fbbe11c3a3703e7ed
parenta5bd2dcb5bcc024f674210234f9ef505b91d7578
parenta3632773bcdfcc322714ec3ce37d59f244d96c20
Merge branch 'master' of http://olsr.org/git/olsrd