Merge branch 'master' into divVerent/speedlimit

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

diff --cc qcsrc/server/sv_main.qc
index da576360aa259a281578ed4e9530b68f81acdd45,f4cc8744518593fcb456907ece1c026174ab059e..85ff7760b3b912e8ea836f47d53639599a81cc8d
--- 1/qcsrc/server/sv_main.qc
--- 2/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@@ -198,9 -198,9 +198,10 @@@ void StartFrame (void
        sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed");
        sv_warsowbunny_turnaccel = cvar("sv_warsowbunny_turnaccel");
        sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio");
 +      sv_speedlimit = cvar("sv_speedlimit");
        teamplay = cvar ("teamplay");
        sys_frametime = cvar("sys_ticrate") * cvar("slowmo");
+       sv_doublejump = cvar("sv_doublejump");
  
        if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)
                orig_slowmo = cvar("slowmo"); // slowmo will be restored after the timeout