Set the default life time for aodv-st, this case, in theory shouldn't occur, but, if for some circumstance occur, this modification solve the problem.
msysGit behaviour, detects the file like change all time
use the promiscuous mode for refresh the neighbors nodes
fix error in batman
fix error in batman
Merge branch 'master' of git://github.com/aarizaq/inetmanet-2.0
remove resuls files
minor refractoring
Merge branch 'integration'
Merge branch 'master' of github.com:aarizaq/inetmanet-2.0
Merge remote-tracking branch 'upstream/master' into inetmanet-2.2

Conflicts:
	src/networklayer/manetrouting/olsr/ChangeLog