From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 8 Feb 2011 09:25:40 +0000 (+0100)
Subject: Merge remote branch 'origin/mirceakitsune/gametypefilter_teamspawns'
X-Git-Tag: xonotic-v0.5.0~311^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=613b4480f70d42c4a02dbad125561db02f61f815;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/gametypefilter_teamspawns'
---

613b4480f70d42c4a02dbad125561db02f61f815