Merge branch 'master' into divVerent/crypto2

Conflicts:
	qcsrc/server/ipban.qc

diff --cc qcsrc/server/ipban.qc
index 9dd3cb51ad08ad1ba7c79e4aaaab79afed593339,ad09772a5354548b64bbc12e656622cf1076f83a..1240aea6e977b615fc270d1ab38cd361d6416a9e
--- 1/qcsrc/server/ipban.qc
--- 2/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@@ -353,9 -353,11 +359,11 @@@ float Ban_GetClientIP(entity client
        if(i3 < 0)
                return FALSE;
        i4 = strstrofs(s, ".", i3 + 1);
+       if(i4 < 0)
+               i4 = strstrofs(s, ":", i3 + 1);
        if(i4 >= 0)
-               return FALSE;
+               s = substring(s, 0, i4);
 -      
 +
        ban_ip1 = substring(s, 0, i1);
        ban_ip2 = substring(s, 0, i2);
        ban_ip3 = substring(s, 0, i3);