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)
commit65f71b6a7b489c6f5a2275928da75a672327a981
tree4f031ad399291746d0f1dd5f33f4c5b0b6f42fe4
parent45a8f6ab25ea786be9ad4d8cbac615688fca8fda
parent901df5228dfcd6e2c229ed41dd97979a8871c9ae
Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'