From: mand1nga <mand1nga@xonotic.org>
Date: Wed, 17 Aug 2011 00:46:04 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-assault
X-Git-Tag: xonotic-v0.5.0~122^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69483a31c5452d2ba20ed4219f8a978b6db10555;p=xonotic%2Fxonotic-data.pk3dir.git

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

69483a31c5452d2ba20ed4219f8a978b6db10555