From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 3 Nov 2010 20:35:16 +0000 (+0100)
Subject: Merge remote branch 'origin/mirceakitsune/red_planet'
X-Git-Tag: xonotic-v0.1.0preview~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2acf9d86ba3e128f0f650c13d55083d234cd0377;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/mirceakitsune/red_planet'
---

2acf9d86ba3e128f0f650c13d55083d234cd0377