Merge remote-tracking branch 'origin/Mirio/leave_em_behind'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:35:47 +0000 (23:35 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:35:47 +0000 (23:35 -0400)

Trivial merge