From: Rudolf Polzer Date: Mon, 20 Jun 2011 08:15:30 +0000 (+0200) Subject: Merge remote branch 'origin/TickleMeElmo/UpdateServerMaps' X-Git-Tag: xonotic-v0.5.0~68 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c35a408fbac529553aec828edcbc209a64d241fa Merge remote branch 'origin/TickleMeElmo/UpdateServerMaps' --- c35a408fbac529553aec828edcbc209a64d241fa