From: Rudolf Polzer Date: Sun, 28 Aug 2011 18:32:48 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/mand1nga/bot-fixes-II' X-Git-Tag: xonotic-v0.5.0~36 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=dbe5f0e93e7cf928814183f40bf306f21a5bbe08 Merge remote-tracking branch 'origin/mand1nga/bot-fixes-II' --- dbe5f0e93e7cf928814183f40bf306f21a5bbe08