From: mand1nga <mand1nga@xonotic.org>
Date: Wed, 20 Apr 2011 05:29:52 +0000 (-0300)
Subject: Merge remote branch 'origin/mand1nga/bot-debug'
X-Git-Tag: xonotic-v0.5.0~109^2~21^2~14
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=88e4782bf4efb1f8e7e6e722194f257c0daf8a01;p=xonotic%2Fxonotic-data.pk3dir.git

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

88e4782bf4efb1f8e7e6e722194f257c0daf8a01