From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 3 Apr 2011 23:02:06 +0000 (-0300)
Subject: Merge remote branch 'origin/mirceakitsune/red_planet'
X-Git-Tag: xonotic-v0.5.0~95^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=afdbed21824891bcc8185b951c6d232313d349cf;p=xonotic%2Fxonotic-maps.pk3dir.git

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

afdbed21824891bcc8185b951c6d232313d349cf