Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

diff --cc server/server.cfg
index 8f495976b89c260c4f41ac7691693468081d6060,9f64194955a845527e1768c6d2f83aba7122252b..2f7a55869535e1f754519e7c91df0d12e2ffa428
--- 1/server/server.cfg
--- 2/server/server.cfg
+++ b/server/server.cfg
@@@ -114,9 -165,11 +165,11 @@@ sv_weaponstats_file http://www.xonotic.
  /////////////////////////////////////////////////////////////////////
  // "Obvious" mutators that are allowed on a "pure" server
  //g_minstagib 0       // set to 1 for MinstaGib
 -g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
 +//g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
  
  
+ 
+ 
  /////////////////////////////////////////////////////////////////////
  // WARNING: anything below this line makes your server "impure"!