From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 9 Apr 2011 01:17:38 +0000 (-0300)
Subject: Merge remote branch 'origin/terencehill/hud_panel_powerups_text_fix'
X-Git-Tag: xonotic-v0.5.0~307^2~4^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d640f864cdbdefc91f91897447abfd2639f9efe;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/hud_panel_powerups_text_fix'
---

8d640f864cdbdefc91f91897447abfd2639f9efe