From: FruitieX <fruitiex@gmail.com>
Date: Wed, 17 Nov 2010 18:54:52 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/gamemode_freezetag
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21a6985a5568f9ade821c914c5d66595ddc4619d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into fruitiex/gamemode_freezetag
---

21a6985a5568f9ade821c914c5d66595ddc4619d