Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:48:26 +0000 (23:48 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:48:26 +0000 (23:48 -0400)

Trivial merge