From: mand1nga <mand1nga@xonotic.org>
Date: Tue, 23 Aug 2011 22:23:30 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-fixes-II
X-Git-Tag: xonotic-v0.5.0~36^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dceb76710d27bc32f51b3cb7b45d24c0a18b0fdf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mand1nga/bot-fixes-II
---

dceb76710d27bc32f51b3cb7b45d24c0a18b0fdf