From: Rudolf Polzer Date: Sat, 10 Jul 2010 20:17:32 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update' X-Git-Tag: xonotic-v0.1.0preview~461 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f66615b722a8527aecfa7a6f2a74bb55204fb16b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update' --- f66615b722a8527aecfa7a6f2a74bb55204fb16b