From: Rudolf Polzer Date: Tue, 15 Jun 2010 09:08:10 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix' X-Git-Tag: xonotic-v0.1.0preview~543 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f5d48dd87aaf7d479958202f3960de01ac877d2;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix' --- 1f5d48dd87aaf7d479958202f3960de01ac877d2