From: FruitieX <fruitiex@gmail.com>
Date: Tue, 30 Nov 2010 13:56:46 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26c8963b7747f4c53fc541df0dd71b7024d1d496;p=xonotic%2Fxonotic-data.pk3dir.git

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

26c8963b7747f4c53fc541df0dd71b7024d1d496