From: mand1nga <mand1nga@xonotic.org>
Date: Tue, 19 Apr 2011 01:37:40 +0000 (-0300)
Subject: Merge remote branch 'origin/mand1nga/bot-debug'
X-Git-Tag: xonotic-v0.5.0~109^2~24^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=335f6e451cea2570b4f6fe86ba91599a951931bd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mand1nga/bot-debug'
---

335f6e451cea2570b4f6fe86ba91599a951931bd