From: mand1nga <mand1nga@xonotic.org>
Date: Wed, 17 Aug 2011 22:37:49 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/mand1nga/bot-assault'
X-Git-Tag: xonotic-v0.5.0~122^2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=f3c0dffcbf2d8bf4cb98fd0d0010d8988f6ea002;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/mand1nga/bot-assault'
---

f3c0dffcbf2d8bf4cb98fd0d0010d8988f6ea002