Merge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair
authorSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:56:42 +0000 (19:56 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:56:42 +0000 (19:56 -0400)

Trivial merge