Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha
authorSamual Lenks <samual@xonotic.org>
Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)

Trivial merge