From: Samual Lenks Date: Tue, 4 Jun 2013 19:20:14 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix' X-Git-Tag: xonotic-v0.7.0~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65f71b6a7b489c6f5a2275928da75a672327a981;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix' --- 65f71b6a7b489c6f5a2275928da75a672327a981