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

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

b6e19f329ad7627599ff59c08b42d8bb60adff18