add whois timeout
Merge branch 'master' into sauerbraten
Merge branch 'sauerbraten' of github.com:pisto/kidban into sauerbraten