From: Rudolf Polzer Date: Sun, 22 May 2011 18:01:04 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/mirceakitsune/red_planet' X-Git-Tag: xonotic-v0.5.0~98^2~18^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8525d1873bf3a5366e0faeeaff028ea1b4229da;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/mirceakitsune/red_planet' --- d8525d1873bf3a5366e0faeeaff028ea1b4229da