From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 30 Nov 2010 20:37:22 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/arenafix'
X-Git-Tag: xonotic-v0.1.0preview~86^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da1e17b0c055f095795b17f4784e175f5f0e2d23;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/arenafix'
---

da1e17b0c055f095795b17f4784e175f5f0e2d23