Merge branch '0.6.0.x' into 0.6.x

This commit is contained in:
Luke Dashjr
2012-08-12 17:22:59 +00:00
35 changed files with 94 additions and 76 deletions

View File

@@ -206,7 +206,7 @@ void ThreadIRCSeed(void* parg)
void ThreadIRCSeed2(void* parg)
{
/* Dont advertise on IRC if we don't allow incoming connections */
/* Don't advertise on IRC if we don't allow incoming connections */
if (mapArgs.count("-connect") || fNoListen)
return;