From: terencehill <piuntn@gmail.com>
Date: Wed, 23 Nov 2011 16:05:01 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/g_changeteam_banned_fix
X-Git-Tag: xonotic-v0.6.0~74^2~110^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23fc0e8dbdfe468cbac2b79e14e03445a9996fd0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/g_changeteam_banned_fix
---

23fc0e8dbdfe468cbac2b79e14e03445a9996fd0