From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 11 Apr 2011 00:32:41 +0000 (-0300)
Subject: Merge remote branch 'origin/samual/fix_hud_configstuff'
X-Git-Tag: xonotic-v0.5.0~305^2~1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b788b5d675fa3b301abb7762042dd326e8f6ad47;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/fix_hud_configstuff'
---

b788b5d675fa3b301abb7762042dd326e8f6ad47