Merge branch 'master' into terencehill/cmd_fixes

Conflicts:
	qcsrc/common/util.qc

diff --cc qcsrc/client/scoreboard.qc
Simple merge

diff --cc qcsrc/common/command/generic.qc
Simple merge

diff --cc qcsrc/common/util.qc
index 6b737603ec039ca02fc0b4c1646f00adab562ee7,a1e0595891b5bf723ee8a7c41d1ce6c4e8ee1acc..020cfd76645da600aaa2dfddaa1ed660125cfebc
--- 1/qcsrc/common/util.qc
--- 2/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -860,6 -860,8 +860,8 @@@ float cvar_settemp(string tmp_cvar, str
        float created_saved_value;
        entity e;
  
 -      created_saved_value = FALSE;
 -      
++      created_saved_value = 0;
++
        if not(tmp_cvar || tmp_value)
        {
                dprint("Error: Invalid usage of cvar_settemp(string, string); !\n");

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge