Merge branch 'master' of git://olsr.org/olsrd
authorMitar <mitar@tnode.com>
Sat, 10 Apr 2010 20:07:16 +0000 (22:07 +0200)
committerMitar <mitar@tnode.com>
Sat, 10 Apr 2010 20:07:16 +0000 (22:07 +0200)
commitf0ab1068d627e5e7455af4c3e54b5b0fe0aa0ba6
treec9c5ec8aef47b36f2f58ec610e05651dc5ab69ad
parent2e3e9e16499ecbc4a25841c33991af6513e9f732
parent014a0002df71c679886b985738653776a7d57877
Merge branch 'master' of git://olsr.org/olsrd