Merge remote-tracking branch 'origin/Mirio/stormkeep'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:45:04 +0000 (13:45 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:45:04 +0000 (13:45 -0400)

Trivial merge