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

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

e621c3ae269746abe26fdc553a0a8fb79954efc2