Merge remote-tracking branch 'origin/Mirio/red-planet'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)

Trivial merge