Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)

Trivial merge