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

Trivial merge