merged with upstream/master

This commit is contained in:
csoler 2015-12-19 19:15:48 -05:00
commit 462f969da7
16 changed files with 253 additions and 103 deletions

View file

@ -343,7 +343,6 @@ int RsGxsNetService::tick()
mLastCleanRejectedMessages = now ;
cleanRejectedMessages() ;
}
return 1;
}