Merge remote-tracking branch 'origin/Mirio/xoylent'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:18:20 +0000 (17:18 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:18:20 +0000 (17:18 -0400)

Trivial merge