Merge remote-tracking branch 'origin/Mirio/silentsiege'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 20:08:15 +0000 (16:08 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 20:08:15 +0000 (16:08 -0400)

Trivial merge