From: Samual Lenks <samual@xonotic.org>
Date: Mon, 22 Apr 2013 21:15:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/red-planet'
X-Git-Tag: xonotic-v0.7.0~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6af2c44a197f2517d57dfa6e812ce55afe26251;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/red-planet'
---

c6af2c44a197f2517d57dfa6e812ce55afe26251