From: mand1nga <mand1nga@xonotic.org>
Date: Wed, 20 Apr 2011 05:28:02 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/bot-debug
X-Git-Tag: xonotic-v0.5.0~109^2~21^2~14^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ce451290a21e3e2ce094eb3c87116fb786723bd;p=xonotic%2Fxonotic-data.pk3dir.git

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

1ce451290a21e3e2ce094eb3c87116fb786723bd