Merge remote-tracking branch 'origin/divVerent/meleefix'
authorSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)

Trivial merge