Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@googlemail.com>
Fri, 23 Jul 2010 15:20:38 +0000 (17:20 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Fri, 23 Jul 2010 15:20:38 +0000 (17:20 +0200)
commitc09e9ccc05a246029ef8cb5891f2e5b395a131d1
treee69502d973c2d9d2368e30c158f07c66effba62c
parent8b6e982be8041507367dedb2ab894be2936c42c6
parenta82ef4b8b86fe17611c523105d04819a3ff87b08
Merge branch 'master' of git://olsr.org/olsrd