From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 13 Aug 2011 03:59:22 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-assault
X-Git-Tag: xonotic-v0.5.0~122^2^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf41af38d628dcb817fd9db48efd3c2200fca68d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mand1nga/bot-assault
---

bf41af38d628dcb817fd9db48efd3c2200fca68d