Merge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix
authorSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)

Trivial merge