From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 18 Nov 2010 06:25:16 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/red-planet-zfight'
X-Git-Tag: xonotic-v0.1.0preview~27
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d10b9e7c79709dd3e807a284b2f806c27c4374d1

Merge remote branch 'origin/fruitiex/red-planet-zfight'
---

d10b9e7c79709dd3e807a284b2f806c27c4374d1