Merge remote-tracking branch 'origin/samual/fix_deathfade'
authorSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 05:07:04 +0000 (01:07 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 05:07:04 +0000 (01:07 -0400)

Trivial merge