Tree-Merge branch 'cgminer' into bfgminer

Conflicts:
	miner.c

miner.c

@@ -5726,10 +5726,10 @@ static void stratum_resumed(struct pool *pool)
 {
 	if (!pool->stratum_notify)
 		return;
-	if (!pool_tclear(pool, &pool->idle))
-		return;
-	applog(LOG_INFO, "Stratum connection to pool %d resumed", pool->pool_no);
-	pool_resus(pool);
+	if (pool_tclear(pool, &pool->idle)) {
+		applog(LOG_INFO, "Stratum connection to pool %d resumed", pool->pool_no);
+		pool_resus(pool);
+	}
 }
 
 /* One stratum thread per pool that has stratum waits on the socket checking