From: Rudolf Polzer Date: Tue, 13 Sep 2011 14:22:13 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/arena_stuff' X-Git-Tag: xonotic-v0.6.0~40^2~141^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8e3716086cc9249b2f93f86f082e1acbc922383;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/arena_stuff' --- b8e3716086cc9249b2f93f86f082e1acbc922383