Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)

Trivial merge