From: mand1nga <mand1nga@xonotic.org>
Date: Tue, 19 Apr 2011 01:36:26 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-debug
X-Git-Tag: xonotic-v0.5.0~109^2~24^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f62aa0ea9e2ecc7f866b39e1bd969031d7ebcb78;p=xonotic%2Fxonotic-data.pk3dir.git

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

f62aa0ea9e2ecc7f866b39e1bd969031d7ebcb78