From: Rudolf Polzer Date: Mon, 20 Jun 2011 08:26:28 +0000 (+0200) Subject: Merge remote branch 'origin/pooga/freezetagbots' after adjusting history X-Git-Tag: xonotic-v0.5.0~199^2~13^2~4 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=94cf38e5a76dfe79cecd83f75d974de2361788b3;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/pooga/freezetagbots' after adjusting history --- 94cf38e5a76dfe79cecd83f75d974de2361788b3