From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 2 Nov 2010 15:14:50 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/nexballarena'
X-Git-Tag: xonotic-v0.1.0preview~50
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=275091648646106dbf6d8c3638a739efc5fa8964;p=xonotic%2Fxonotic-maps.pk3dir.git

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

275091648646106dbf6d8c3638a739efc5fa8964