Automated merge with http://gredler.at/hg/olsrd
Automated merge with http://gredler.at/hg/olsrd

ninuxorg/olsrd,ninuxorg/olsrd,tdz/olsrd,ninuxorg/olsrd,nolith/olsrd,diogomg/olsrd,diogomg/olsrd-binary-heap,diogomg/olsrd,cholin/olsrd,zioproto/olsrd,zioproto/olsrd,nolith/olsrd,duydb2/olsr,diogomg/olsrd,servalproject/olsr,tdz/olsrd,sebkur/olsrd,nolith/olsrd,ralisi/olsrd_cl_roam,ralisi/olsrd_cl_roam,tdz/olsrd,acinonyx/olsrd,ralisi/olsrd_cl_roam,zioproto/olsrd,zioproto/olsrd,servalproject/olsr,tdz/olsrd,sebkur/olsrd,brabander/olsr,sebkur/olsrd,acinonyx/olsrd,servalproject/olsr,diogomg/olsrd-binary-heap,sebkur/olsrd,tdz/olsrd,diogomg/olsrd-binary-heap,acinonyx/olsrd,brabander/olsr,servalproject/olsr,cholin/olsrd,brabander/olsr,duydb2/olsr,servalproject/olsr,brabander/olsr,acinonyx/olsrd,zioproto/olsrd,diogomg/olsrd-binary-heap,diogomg/olsrd,diogomg/olsrd-binary-heap,cholin/olsrd,duydb2/olsr,sebkur/olsrd,duydb2/olsr,diogomg/olsrd,duydb2/olsr,ninuxorg/olsrd,duydb2/olsr,diogomg/olsrd-binary-heap,nolith/olsrd,ninuxorg/olsrd,ralisi/olsrd_cl_roam,diogomg/olsrd-binary-heap,acinonyx/olsrd,cholin/olsrd,nolith/olsrd,diogomg/olsrd,diogomg/olsrd,servalproject/olsr,duydb2/olsr,cholin/olsrd,duydb2/olsr,sebkur/olsrd