Merge branch 'master' into jgrpp

# Conflicts:
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt

src/network/network_gui.cpp

@@ -348,7 +348,7 @@ protected:
 		if (r == 0) r = a->info.use_password - b->info.use_password;
 
 		/* Finally sort on the number of clients of the server in reverse order. */
-		return (r != 0) ? r < 0 : !NGameClientSorter(a, b);
+		return (r != 0) ? r < 0 : NGameClientSorter(b, a);
 	}
 
 	/** Sort the server list */