Merge remote-tracking branch 'origin/matthiaskrgr/space-elevator_autoSC_ent'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:44:21 +0000 (12:44 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:44:21 +0000 (12:44 -0400)

Trivial merge