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

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

b28e94c9e28dca6e3ee80d2e4f0aeb71b8074786