From: merlijn Date: Sat, 4 Jun 2011 17:37:40 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script' X-Git-Tag: xonotic-v0.5.0~74^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a6c9910117edcaf2037fb0ad5b152592c2e26b1;p=xonotic%2Fxonotic.git Merge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script' --- 3a6c9910117edcaf2037fb0ad5b152592c2e26b1