From: mand1nga <mand1nga@xonotic.org>
Date: Thu, 18 Aug 2011 22:22:08 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-fixes-II
X-Git-Tag: xonotic-v0.5.0~36^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0117479ba4e6b21a3ba53f71b343b85398bdfedc;p=xonotic%2Fxonotic-data.pk3dir.git

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

0117479ba4e6b21a3ba53f71b343b85398bdfedc