Merge branch 'stable' of git://olsr.org/olsrd into stable
authorMarkus Kittenberger <markus@markit.unassigned-domain>
Tue, 9 Nov 2010 09:12:18 +0000 (10:12 +0100)
committerMarkus Kittenberger <markus@markit.unassigned-domain>
Tue, 9 Nov 2010 09:12:18 +0000 (10:12 +0100)
commit3f2b3870b041a2388ebef52c68a79ec0de5ac30f
treee5f36a0d28bb051197f30f91a4382c040b5095f9
parentaf9300bcdc5c24ddd301c23d07e80df504a84ef8
parentcad9fd6d5e42dec08fb827f8331d58d2804eaa71
Merge branch 'stable' of git://olsr.org/olsrd into stable