From: mand1nga <mand1nga@xonotic.org>
Date: Wed, 13 Apr 2011 14:37:01 +0000 (-0300)
Subject: Merge remote branch 'origin/mand1nga/bot-misc-fixes'
X-Git-Tag: xonotic-v0.5.0~274^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9f3e2397be8aae00ac2b4912edf9c8fc3221c25;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mand1nga/bot-misc-fixes'
---

e9f3e2397be8aae00ac2b4912edf9c8fc3221c25