From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 20:50:52 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/space-elevator'
X-Git-Tag: xonotic-v0.1.0preview~30
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=fb3dfaa47dcd105b2bf32b4b1885ef5014dda448;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/space-elevator'
---

fb3dfaa47dcd105b2bf32b4b1885ef5014dda448